Fix compile errors after removing boost function include from dali-core

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / control-impl.cpp

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 216491b..16b4e67 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -19,10 +19,11 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // EXTERNAL INCLUDES

+#include <cstring> // for strcmp
+#include <limits>

 #include <stack>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/mesh-actor.h>
 #include <stack>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/mesh-actor.h>

-#include <dali/public-api/animation/active-constraint.h>

 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/geometry/mesh.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/geometry/mesh.h>


@@ -140,10 +141,11 @@ void SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const
   actor.SetZ( BACKGROUND_ACTOR_Z_POSITION );
   actor.SetRelayoutEnabled( false );
 
   actor.SetZ( BACKGROUND_ACTOR_Z_POSITION );
   actor.SetRelayoutEnabled( false );
 

-  Constraint constraint = Constraint::New<Vector3>( constrainingIndex,
-                                                    ParentSource( Actor::Property::SIZE ),
+  Constraint constraint = Constraint::New<Vector3>( actor,
+                                                    constrainingIndex,

                                                     EqualToConstraint() );
                                                     EqualToConstraint() );

-  actor.ApplyConstraint( constraint );
+  constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
+  constraint.Apply();

 }
 
 } // unnamed namespace
 }
 
 } // unnamed namespace