Remove usage of deprecated Button::SetLabelText

[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 c21bdae..729cf80 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -371,6 +371,11 @@ protected: // For derived classes to call
   /**
    * @brief Create a transition effect on the control.
    *
+   * Only generates an animation if the properties described in the transition
+   * data are staged (e.g. the visual is Enabled and the control is on stage).
+   * Otherwise the target values are stored, and will get set onto the properties
+   * when the visual is next staged.
+   *
    * @SINCE_1_2.12
    *
    * @param[in] transitionData The transition data describing the effect to create
@@ -416,6 +421,12 @@ protected: // From CustomActorImpl, not to be used by application developers
   virtual void OnChildRemove( Actor& child );
 
   /**
+   * @copydoc CustomActorImpl::OnPropertySet()
+   * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end.
+   */
+  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
+
+  /**
    * @copydoc CustomActorImpl::OnSizeSet()
    * @note If overridden, then an up-call to Control::OnSizeSet MUST be made at the end.
    */