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

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index f472375..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) 2015 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,15 +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>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
 
 namespace Dali
 {
@@ -58,121 +60,6 @@ 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::SetAutoRepeating( bool autoRepeating )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetAutoRepeating( autoRepeating );
-}
-
-bool Button::IsAutoRepeating() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).IsAutoRepeating();
-}
-
-void Button::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetInitialAutoRepeatingDelay( initialAutoRepeatingDelay );
-}
-
-float Button::GetInitialAutoRepeatingDelay() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).GetInitialAutoRepeatingDelay();
-}
-
-void Button::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetNextAutoRepeatingDelay( nextAutoRepeatingDelay );
-}
-
-float Button::GetNextAutoRepeatingDelay() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).GetNextAutoRepeatingDelay();
-}
-
-void Button::SetTogglableButton( bool togglable )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetTogglableButton( togglable );
-}
-
-bool Button::IsTogglableButton() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).IsTogglableButton();
-}
-
-void Button::SetSelected( bool selected )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetSelected( selected );
-}
-
-bool Button::IsSelected() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).IsSelected();
-}
-
-void Button::SetAnimationTime( float animationTime )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetAnimationTime( animationTime );
-}
-
-float Button::GetAnimationTime() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
-}
-
-void Button::SetLabelText( const std::string& label )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetLabelText( label );
-}
-
-std::string Button::GetLabelText() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).GetLabelText();
-}
-
-void Button::SetUnselectedImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetUnselectedImage( filename );
-}
-
-void Button::SetBackgroundImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( filename );
-}
-
-void Button::SetSelectedImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( filename );
-}
-
-void Button::SetSelectedBackgroundImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( filename );
-}
-
-void Button::SetDisabledBackgroundImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( filename );
-}
-
-void Button::SetDisabledImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( filename );
-}
-
-void Button::SetDisabledSelectedImage( const std::string& filename )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( filename );
-}
-
 Button::ButtonSignalType& Button::PressedSignal()
 {
   return Dali::Toolkit::GetImplementation( *this ).PressedSignal();
@@ -193,38 +80,6 @@ Button::ButtonSignalType& Button::StateChangedSignal()
   return Dali::Toolkit::GetImplementation( *this ).StateChangedSignal();
 }
 
-// Deprecated API
-
-void Button::SetLabel( Actor label )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
-}
-
-void Button::SetButtonImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
-}
-
-void Button::SetSelectedImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
-}
-
-Actor Button::GetButtonImage() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
-}
-
-Actor Button::GetSelectedImage() const
-{
-  return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
-}
-
-
 Button::Button( Internal::Button& implementation )
 : Control( implementation )
 {