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
Move virtual destructor position to its original
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.h
diff --git
a/dali-toolkit/public-api/controls/control-impl.h
b/dali-toolkit/public-api/controls/control-impl.h
index
9993237
..
be76939
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.h
+++ b/
dali-toolkit/public-api/controls/control-impl.h
@@
-61,6
+61,13
@@
namespace Internal
*/
class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface
{
*/
class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface
{
+protected:
+ /**
+ * @brief Virtual destructor.
+ * @SINCE_1_0.0
+ */
+ virtual ~Control();
+
public:
class Extension; ///< Forward declare future extension interface
public:
class Extension; ///< Forward declare future extension interface
@@
-76,12
+83,6
@@
public:
*/
static Toolkit::Control New();
*/
static Toolkit::Control New();
- /**
- * @brief Virtual destructor.
- * @SINCE_1_0.0
- */
- virtual ~Control();
-
// Styling
/**
// Styling
/**
@@
-547,7
+548,7
@@
public: // API for derived classes to override
* @SINCE_1_0.0
* @param[in] child The added actor.
*/
* @SINCE_1_0.0
* @param[in] child The added actor.
*/
- virtual void OnControlChildAdd( Actor& child );
+ virtual void OnControlChildAdd( Actor& child )
DALI_DEPRECATED_API
;
/**
* @DEPRECATED_1_1.30. Override OnChildRemove instead.
/**
* @DEPRECATED_1_1.30. Override OnChildRemove instead.
@@
-559,7
+560,7
@@
public: // API for derived classes to override
* @SINCE_1_0.0
* @param[in] child The removed actor.
*/
* @SINCE_1_0.0
* @param[in] child The removed actor.
*/
- virtual void OnControlChildRemove( Actor& child );
+ virtual void OnControlChildRemove( Actor& child )
DALI_DEPRECATED_API
;
// Styling
// Styling