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
Merge "Internal::Control cleanup, remove dead an non-needed methods and adding missin...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index
a90c335
..
be978a7
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@
-508,9
+508,9
@@
private: // private overriden functions from CustomActorImpl and Controls
virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
/**
virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
/**
- * @copydoc
Dali::Control::OnControl
SizeSet(const Vector3&)
+ * @copydoc
CustomActorImpl::On
SizeSet(const Vector3&)
*/
*/
- virtual void On
Control
SizeSet( const Vector3& size );
+ virtual void OnSizeSet( const Vector3& size );
/**
* From CustomActorImpl; called after a child has been added to the owning actor.
/**
* From CustomActorImpl; called after a child has been added to the owning actor.
@@
-547,14
+547,14
@@
private: // private overriden functions from CustomActorImpl and Controls
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc
Toolkit::Control::OnControl
StageConnection()
+ * @copydoc
CustomActorImpl::On
StageConnection()
*/
*/
- virtual void On
Control
StageConnection();
+ virtual void OnStageConnection();
/**
/**
- * @copydoc
Toolkit::Control::OnControlStageC
onnection()
+ * @copydoc
CustomActorImpl::OnStageDisc
onnection()
*/
*/
- virtual void On
Control
StageDisconnection();
+ virtual void OnStageDisconnection();
/**
* @copydoc Toolkit::Control::OnAccessibilityPan()
/**
* @copydoc Toolkit::Control::OnAccessibilityPan()