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 "Fix the warning log in Control causing the wrong position" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.h
b/dali-toolkit/internal/visuals/visual-base-impl.h
index
f496467
..
f740909
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-178,6
+178,7
@@
protected:
virtual ~Base();
protected:
virtual ~Base();
protected:
+
/**
* @brief Called by CreatePropertyMap() allowing sub classes to respond to the CreatePropertyMap event
*
/**
* @brief Called by CreatePropertyMap() allowing sub classes to respond to the CreatePropertyMap event
*
@@
-198,8
+199,6
@@
protected:
*/
virtual void OnSetTransform() = 0;
*/
virtual void OnSetTransform() = 0;
-protected:
-
/**
* @brief Called by SetOnStage() allowing sub classes to respond to the SetOnStage event
*
/**
* @brief Called by SetOnStage() allowing sub classes to respond to the SetOnStage event
*