Make radio buttons work with size negotiation, bug fixes.

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / controls / buttons / push-button.cpp

diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp
index 5ca5681..f6e2775 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp
+++ b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 
@@ -28,7 +29,6 @@ namespace Dali
 namespace Toolkit
 {
 
-const char* const PushButton::SIGNAL_TOGGLED = "toggled";
 const char* const PushButton::SIGNAL_PRESSED = "pressed";
 const char* const PushButton::SIGNAL_RELEASED = "released";
 
@@ -218,11 +218,6 @@ Actor PushButton::GetLabelText() const
   return Dali::Toolkit::GetImplementation( *this ).GetLabelText();
 }
 
-PushButton::ToggledSignalV2& PushButton::ToggledSignal()
-{
-  return Dali::Toolkit::GetImplementation( *this ).ToggledSignal();
-}
-
 PushButton::PressedSignalV2& PushButton::PressedSignal()
 {
   return Dali::Toolkit::GetImplementation( *this ).PressedSignal();