Button refactoring: rename properties

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

diff --git a/base/dali-toolkit/public-api/controls/buttons/button.cpp b/base/dali-toolkit/public-api/controls/buttons/button.cpp
index 55764a2..89aefc5 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/base/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -30,6 +30,7 @@ namespace Toolkit
 {
 
 const char* const Button::SIGNAL_CLICKED = "clicked";
+const char* const Button::SIGNAL_STATE_CHANGED = "state-changed";
 
 Button::Button()
 {}
@@ -57,14 +58,14 @@ Button Button::DownCast( BaseHandle handle )
   return Control::DownCast<Button, Internal::Button>(handle);
 }
 
-void Button::SetDimmed( bool dimmed )
+void Button::SetDisabled( bool disabled )
 {
-  Dali::Toolkit::GetImplementation( *this ).SetDimmed( dimmed );
+  Dali::Toolkit::GetImplementation( *this ).SetDisabled( disabled );
 }
 
-bool Button::IsDimmed() const
+bool Button::IsDisabled() const
 {
-  return Dali::Toolkit::GetImplementation( *this ).IsDimmed();
+  return Dali::Toolkit::GetImplementation( *this ).IsDisabled();
 }
 
 void Button::SetAnimationTime( float animationTime )
@@ -77,11 +78,16 @@ float Button::GetAnimationTime() const
   return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
 }
 
-Button::ClickedSignalV2& Button::ClickedSignal()
+Button::ClickedSignalType& Button::ClickedSignal()
 {
   return Dali::Toolkit::GetImplementation( *this ).ClickedSignal();
 }
 
+Button::StateChangedSignalType& Button::StateChangedSignal()
+{
+  return Dali::Toolkit::GetImplementation( *this ).StateChangedSignal();
+}
+
 Button::Button( Internal::Button& implementation )
 : Control( implementation )
 {