X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-base-impl.h;h=968e3ab836da18dad5ce4dcf2a6d7280bd0e4e67;hp=fa9693e3372b4576d24ff4e40810588f5a989fc2;hb=refs%2Ftags%2Faccepted%2Ftizen%2Fmobile%2F20150309.081750;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
index fa9693e..968e3ab 100644
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
@@ -21,6 +21,8 @@
 // EXTERNAL INCLUDES
 // TODO - Replace list with dali-vector.h
 #include <list>
+#include <dali/public-api/animation/active-constraint.h>
+#include <dali/public-api/animation/constraint.h>
 
 // INTERNAL INCLUDES
 
@@ -180,7 +182,7 @@ public:
 
 protected:
 
-  static const std::string SCROLL_DOMAIN_OFFSET_PROPERTY_NAME;
+  static const char* const SCROLL_DOMAIN_OFFSET_PROPERTY_NAME;
 
 protected:
 
@@ -200,7 +202,6 @@ protected:
   Property::Index mPropertyTime;                    ///< Scroll Time (0 to animationDuration while animating, otherwise 0)
   Property::Index mPropertyPrePosition;             ///< Scroll Position ("scroll-position") [function of scroll-x, scroll-y]
   Property::Index mPropertyPosition;                ///< Scroll Position ("scroll-position") [function of scroll-pre-position]
-  Property::Index mPropertyScale;                   ///< Scroll Scale ("scroll-scale")
   Property::Index mPropertyOvershootX;              ///< Scroll Overshoot ("scroll-overshoot-x") [function of scroll-pre-position, scroll-position]
   Property::Index mPropertyOvershootY;              ///< Scroll Overshoot ("scroll-overshoot-y") [function of scroll-pre-position, scroll-position]
   Property::Index mPropertyWrap;                    ///< Scroll Wrap ("scroll-wrap")