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 "Change the double tap and long press events on top of no text actions to highl...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
control-wrapper-impl.h
diff --git
a/dali-toolkit/devel-api/controls/control-wrapper-impl.h
b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
index
fa9173f
..
33905a5
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@
-64,9
+64,13
@@
public:
/**
* Create a new ControlWrapper.
/**
* Create a new ControlWrapper.
+ *
+ * @param[in] typeName The name of the type that is registered with this control
+ * @param[in] controlWrapper The implementation of this control
+ *
* @return A public handle to the newly allocated ControlWrapper.
*/
* @return A public handle to the newly allocated ControlWrapper.
*/
- static Dali::Toolkit::ControlWrapper New( ControlWrapper* controlWrapper );
+ static Dali::Toolkit::ControlWrapper New(
const std::string& typeName,
ControlWrapper* controlWrapper );
public: // From CustomActorImpl
public: // From CustomActorImpl