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
Calculate a new height when text was changed.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
control-wrapper.h
diff --git
a/dali-toolkit/devel-api/controls/control-wrapper.h
b/dali-toolkit/devel-api/controls/control-wrapper.h
index
a9aacc5
..
b50852b
100644
(file)
--- a/
dali-toolkit/devel-api/controls/control-wrapper.h
+++ b/
dali-toolkit/devel-api/controls/control-wrapper.h
@@
-45,9
+45,12
@@
public:
/**
* @brief Create a new instance of a ControlWrapper.
*
/**
* @brief Create a new instance of a ControlWrapper.
*
+ * @param[in] typeName The name of the type that is registered with this control
+ * @param[in] implementation The implementation of this control
+ *
* @return A handle to a new ControlWrapper.
*/
* @return A handle to a new ControlWrapper.
*/
- static ControlWrapper New( Internal::ControlWrapper& implementation );
+ static ControlWrapper New(
const std::string& typeName,
Internal::ControlWrapper& implementation );
/**
* @brief Creates an empty ControlWrapper handle.
/**
* @brief Creates an empty ControlWrapper handle.
@@
-95,14
+98,14
@@
public: // Not intended for application developers
*
* @param[in] implementation The Control implementation.
*/
*
* @param[in] implementation The Control implementation.
*/
-
DALI_INTERNAL
ControlWrapper( Internal::ControlWrapper& implementation );
+ ControlWrapper( Internal::ControlWrapper& implementation );
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
*
* @param[in] internal A pointer to the internal CustomActor.
*/
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
*
* @param[in] internal A pointer to the internal CustomActor.
*/
- explicit
DALI_INTERNAL
ControlWrapper( Dali::Internal::CustomActor* internal );
+ explicit ControlWrapper( Dali::Internal::CustomActor* internal );
};
} // namespace Toolkit
};
} // namespace Toolkit