Size negotiation patch 3: Scope size negotiation enums

[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 f128778..d9e395e 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/push-button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/push-button.cpp
@@ -77,7 +77,7 @@ PushButton PushButton::DownCast( BaseHandle handle )
 void PushButton::SetButtonImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );
 void PushButton::SetButtonImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );

-  imageActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );

   Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
 }
 
   Dali::Toolkit::GetImplementation( *this ).SetButtonImage( imageActor );
 }
 


@@ -94,7 +94,7 @@ Actor PushButton::GetButtonImage() const
 void PushButton::SetBackgroundImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );
 void PushButton::SetBackgroundImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );

-  imageActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );

   Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( imageActor );
 }
 
   Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( imageActor );
 }
 


@@ -111,7 +111,7 @@ Actor PushButton::GetBackgroundImage() const
 void PushButton::SetSelectedImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );
 void PushButton::SetSelectedImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );

-  imageActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );

   Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
 }
 
   Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageActor );
 }
 


@@ -143,7 +143,7 @@ Actor PushButton::GetSelectedBackgroundImage() const
 void PushButton::SetDisabledBackgroundImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );
 void PushButton::SetDisabledBackgroundImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );

-  imageActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );

   Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( imageActor );
 }
 
   Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( imageActor );
 }
 


@@ -160,7 +160,7 @@ Actor PushButton::GetDisabledBackgroundImage() const
 void PushButton::SetDisabledImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );
 void PushButton::SetDisabledImage( Image image )
 {
   Actor imageActor = ImageActor::New( image );

-  imageActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+  imageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );

   Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( imageActor );
 }
 
   Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( imageActor );
 }