X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.h;h=62d087bd1cb4f08e611919e5778f3c0a2a18a7e6;hb=fb545906ceea3a2946c8a451f34ea7da283c4ffe;hp=92786d4c6f19b02c28ed9fb44f0589bbaa1ea991;hpb=f7ca0a1c753ea498df357add70b5c7a9bad4ea91;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 92786d4..62d087b 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -76,12 +76,6 @@ public: */ static Toolkit::Control New(); - /** - * @brief Virtual destructor. - * @SINCE_1_0.0 - */ - virtual ~Control(); - // Styling /** @@ -306,12 +300,11 @@ protected: // For derived classes to call * @SINCE_1_2.0 * * @param[in] index The Property index of the visual, used to reference visual - * @param[in] placementActor The actor used to by the visual. * @param[in] visual The visual to register - * @note Derived class should not call visual.SetOnStage(placementActor). It is the responsibility of the base class to connect/disconnect registered visual to stage. + * @note Derived class should not call visual.SetOnStage(actor). It is the responsibility of the base class to connect/disconnect registered visual to stage. * Use below API with enabled set to false if derived class wishes to control when visual is staged. */ - void RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual ); + void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ); /** * @brief Register a visual by Property Index, linking an Actor to visual when required. @@ -322,12 +315,11 @@ protected: // For derived classes to call * @SINCE_1_2.11 * * @param[in] index The Property index of the visual, used to reference visual - * @param[in] placementActor The actor used to by the visual. * @param[in] visual The visual to register * @param[in] enabled false if derived class wants to control when visual is set on stage. * */ - void RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual, bool enabled ); + void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ); /** * @brief Erase the entry matching the given index from the list of registered visuals @@ -369,17 +361,6 @@ protected: // For derived classes to call bool IsVisualEnabled( Property::Index index ) const; /** - * @brief Retrieve the placement actor associated with the given index. - * - * @SINCE_1_2.2 - * - * @@param[in] index The Property index of the visual. - * @return Then placement actor if exist, otherwise empty handle. - * @note For managing object life-cycle, do not store the returned placement actor as a member which increments its reference count. - */ - Actor GetPlacementActor( Property::Index index ) const; - - /** * @brief Create a transition effect on the control. * * @SINCE_1_2.12 @@ -533,6 +514,12 @@ protected: // Helpers for deriving classes Control( ControlBehaviour behaviourFlags ); /** + * @brief Virtual destructor. + * @SINCE_1_0.0 + */ + virtual ~Control(); + + /** * @brief Second phase initialization. * @SINCE_1_0.0 */ @@ -560,7 +547,7 @@ public: // API for derived classes to override * @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. @@ -572,7 +559,7 @@ public: // API for derived classes to override * @SINCE_1_0.0 * @param[in] child The removed actor. */ - virtual void OnControlChildRemove( Actor& child ); + virtual void OnControlChildRemove( Actor& child ) DALI_DEPRECATED_API; // Styling