X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fbutton.cpp;h=70377b3003219d53158311f4809c5ce575a39531;hb=d7cef550d3627f3a161913ab1805a7faf0a15f36;hp=89aefc564bf71b629a20f7f5650a7d557d02f59d;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index 89aefc5..70377b3 100644
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -16,12 +16,17 @@
  */
 
 // CLASS HEADER
-
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/property-map.h>
+#include <dali/public-api/images/resource-image.h>
 
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/buttons/button-impl.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
 
 namespace Dali
 {
@@ -29,9 +34,6 @@ namespace Dali
 namespace Toolkit
 {
 
-const char* const Button::SIGNAL_CLICKED = "clicked";
-const char* const Button::SIGNAL_STATE_CHANGED = "state-changed";
-
 Button::Button()
 {}
 
@@ -58,32 +60,22 @@ Button Button::DownCast( BaseHandle handle )
   return Control::DownCast<Button, Internal::Button>(handle);
 }
 
-void Button::SetDisabled( bool disabled )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetDisabled( disabled );
-}
-
-bool Button::IsDisabled() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).IsDisabled();
-}
-
-void Button::SetAnimationTime( float animationTime )
+Button::ButtonSignalType& Button::PressedSignal()
 {
-  Dali::Toolkit::GetImplementation( *this ).SetAnimationTime( animationTime );
+  return Dali::Toolkit::GetImplementation( *this ).PressedSignal();
 }
 
-float Button::GetAnimationTime() const
+Button::ButtonSignalType& Button::ReleasedSignal()
 {
-  return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
+  return Dali::Toolkit::GetImplementation( *this ).ReleasedSignal();
 }
 
-Button::ClickedSignalType& Button::ClickedSignal()
+Button::ButtonSignalType& Button::ClickedSignal()
 {
   return Dali::Toolkit::GetImplementation( *this ).ClickedSignal();
 }
 
-Button::StateChangedSignalType& Button::StateChangedSignal()
+Button::ButtonSignalType& Button::StateChangedSignal()
 {
   return Dali::Toolkit::GetImplementation( *this ).StateChangedSignal();
 }