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
[dali_1.2.33] Merge branch 'devel/master'
[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
787fa89
..
33905a5
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@
-38,7
+38,7
@@
typedef IntrusivePtr< ControlWrapper > ControlWrapperPtr;
/**
* @copydoc Toolkit::ControlWrapper
*/
/**
* @copydoc Toolkit::ControlWrapper
*/
-class ControlWrapper : public Control
+class
DALI_IMPORT_API
ControlWrapper : public Control
{
public:
{
public:
@@
-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
@@
-157,12
+161,13
@@
protected:
private:
private:
- // Undefined.
- ControlWrapper( const ControlWrapper& );
-
- // Undefined.
- ControlWrapper& operator=( const ControlWrapper& rhs );
+ /// @cond internal
+ /// Undefined.
+ DALI_INTERNAL ControlWrapper( const ControlWrapper& );
+ /// Undefined.
+ DALI_INTERNAL ControlWrapper& operator=( const ControlWrapper& rhs );
+ /// @endcond
};
} // namespace Internal
};
} // namespace Internal