projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates after Handle/Constrainable merge
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-connector.h
diff --git
a/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
b/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
index
8cd78b7
..
986f12f
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scroll-connector.h
+++ b/
dali-toolkit/public-api/controls/scrollable/scroll-connector.h
@@
-19,7
+19,7
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/object/
constrainab
le.h>
+#include <dali/public-api/object/
hand
le.h>
namespace Dali
{
namespace Dali
{
@@
-161,7
+161,7
@@
public:
* @brief Retrieve the object which provides the "scroll-position" property.
* @return The scroll-position object.
*/
* @brief Retrieve the object which provides the "scroll-position" property.
* @return The scroll-position object.
*/
-
Constrainab
le GetScrollPositionObject() const;
+
Hand
le GetScrollPositionObject() const;
public: // Not intended for application developers
public: // Not intended for application developers