Move more public-api headers to devel-api. PART 3

[platform/core/uifw/dali-demo.git] / examples / buttons / buttons-example.cpp

diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp
index 88aa86f..1dfdce1 100644 (file)
--- a/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@ -18,6 +18,7 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 
@@ -214,8 +215,8 @@ class ButtonsController: public ConnectionTracker
     mBigImage3 = ResourceImage::New( BIG_IMAGE_3 );
 
     mImage = ImageActor::New( mBigImage1 );
-    mImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
-    mImage.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::WIDTH );
+    mImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    mImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
     radioGroup2Background.AddChild( mImage, Toolkit::TableView::CellPosition( 0, 1, 2, 1 ) );
 
     // The enable/disable radio group
@@ -349,7 +350,6 @@ class ButtonsController: public ConnectionTracker
 
     contentTable.Add( toggleBackground );
 
-
     Toolkit::PushButton toggleButton = Toolkit::PushButton::New();
     toggleButton.SetTogglableButton( true );
     toggleButton.SetLabel( "Unselected" );
@@ -485,7 +485,7 @@ class ButtonsController: public ConnectionTracker
       {
         if( mAnimation )
         {
-          mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
+          mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
           mAnimation.Play();
           mLastPoint = localPoint;
         }
@@ -498,7 +498,7 @@ class ButtonsController: public ConnectionTracker
  private:
 
   Application&      mApplication;
-  Toolkit::View     mView;                              ///< The View instance.
+  Toolkit::Control  mView;                              ///< The View instance.
   Toolkit::ToolBar  mToolBar;                           ///< The View's Toolbar.
   Layer             mContentLayer;                      ///< Content layer