Merge "Added scroll view page path effect. Allows creating new scroll view effects...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / scrollable / scroll-connector-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
index f9a201e..ff91e1b 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
@@ -115,11 +115,22 @@ public:
    * Retrieve the object which provides the "scroll-position" property.
    * @return The scroll-position object.
    */
-  Constrainable GetScrollPositionObject() const
+  Handle GetScrollPositionObject() const
   {
     return mScrollPositionObject;
   }
 
+  /**
+   * Connects a callback function with the object's signals.
+   * @param[in] object The object providing the signal.
+   * @param[in] tracker Used to disconnect the signal.
+   * @param[in] signalName The signal to connect to.
+   * @param[in] functor A newly allocated FunctorDelegate.
+   * @return True if the signal was connected.
+   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
+   */
+  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
+
 private:
 
   /**
@@ -140,7 +151,7 @@ private:
 
 private:
 
-  Constrainable mScrollPositionObject;
+  Handle mScrollPositionObject;
 
   DomainChangedSignalType mDomainChangedSignal;
   ScrollPositionChangedSignalType mScrollPositionChangedSignal;