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 branch 'devel/master' into devel/new_mesh
[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
86577c7
..
ca7106e
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
@@
-549,7
+549,7
@@
private: // private overriden functions from CustomActorImpl and Controls
/**
* @copydoc CustomActorImpl::OnStageConnection()
*/
- virtual void OnStageConnection();
+ virtual void OnStageConnection(
unsigned int depth
);
/**
* @copydoc CustomActorImpl::OnStageDisconnection()