Moved PushButton::SetButtonImage etc to Button base class.

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

diff --git a/dali-toolkit/public-api/controls/buttons/push-button.cpp b/dali-toolkit/public-api/controls/buttons/push-button.cpp
index 0ef9698..d3f21d7 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/push-button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/push-button.cpp
@@ -74,12 +74,6 @@ PushButton PushButton::DownCast( BaseHandle handle )
   return Control::DownCast<PushButton, Internal::PushButton>(handle);
 }
 
   return Control::DownCast<PushButton, Internal::PushButton>(handle);
 }
 

-void PushButton::SetButtonImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
-}
-

 void PushButton::SetButtonImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image );
 void PushButton::SetButtonImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image );


@@ -90,12 +84,6 @@ Actor PushButton::GetButtonImage() const
   return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).GetButtonImage();
 }
 

-void PushButton::SetBackgroundImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( imageActor );
-}
-

 void PushButton::SetBackgroundImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( image );
 void PushButton::SetBackgroundImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( image );


@@ -106,13 +94,6 @@ Actor PushButton::GetBackgroundImage() const
   return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
 }
 

-void PushButton::SetSelectedImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
-}
-

 void PushButton::SetSelectedImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
 void PushButton::SetSelectedImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );


@@ -123,11 +104,6 @@ Actor PushButton::GetSelectedImage() const
   return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
 }
 

-void PushButton::SetSelectedBackgroundImage( Image image )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( ImageActor::New( image ) );
-}
-

 void PushButton::SetSelectedBackgroundImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( image );
 void PushButton::SetSelectedBackgroundImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( image );


@@ -138,13 +114,6 @@ Actor PushButton::GetSelectedBackgroundImage() const
   return Dali::Toolkit::GetImplementation( *this ).GetSelectedBackgroundImage();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).GetSelectedBackgroundImage();
 }
 

-void PushButton::SetDisabledBackgroundImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( imageActor );
-}
-

 void PushButton::SetDisabledBackgroundImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image );
 void PushButton::SetDisabledBackgroundImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image );


@@ -155,13 +124,6 @@ Actor PushButton::GetDisabledBackgroundImage() const
   return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
 }
 
   return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
 }
 

-void PushButton::SetDisabledImage( Image image )
-{
-  Actor imageActor = ImageActor::New( image );
-  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( imageActor );
-}
-

 void PushButton::SetDisabledImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image );
 void PushButton::SetDisabledImage( Actor image )
 {
   Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image );