Merge "Add a TextEditor property to limit input to maximum characters" into devel...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / control-devel.h

diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index eb2bcda..e749ed1 100755 (executable)
--- a/dali-toolkit/devel-api/controls/control-devel.h
+++ b/dali-toolkit/devel-api/controls/control-devel.h
@@ -53,8 +53,6 @@ namespace Property
 enum
 {
   STYLE_NAME            = Control::Property::STYLE_NAME,
-  RESERVED_PROPERTY_01  = Control::Property::RESERVED_PROPERTY_01,
-  RESERVED_PROPERTY_02  = Control::Property::RESERVED_PROPERTY_02,
   KEY_INPUT_FOCUS       = Control::Property::KEY_INPUT_FOCUS,
   BACKGROUND            = Control::Property::BACKGROUND,
   MARGIN                = Control::Property::MARGIN,
@@ -115,7 +113,13 @@ enum
    * @details Name "downFocusableActorId", type Property::INTEGER.
    *
    */
-  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7
+  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7,
+
+  /**
+   * @brief The shadow of the control.
+   * @details Name "shadow", type Property::MAP.
+   */
+  SHADOW = PADDING + 8
 };
 
 } // namespace Property
@@ -127,7 +131,7 @@ enum
  * @param[in] index The Property index of the visual, used to reference visual
  * @param[in] visual The visual to register
  *
- * @note Derived class should not call visual.SetOnStage(actor). It is the responsibility of the base class to connect/disconnect registered visual to stage.
+ * @note Derived class should not call visual.SetOnScene(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.
  * @note If the depth-index is not set on the visual, then it is set to be above the currently registered visuals.
  * @note If replacing a visual, then the depth-index of the visual being replaced is used for the visual.
@@ -142,7 +146,7 @@ DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property
  * @param[in] visual The visual to register
  * @param[in] depthIndex The visual's depth-index is set to this
  *
- * @note Derived class should not call visual.SetOnStage(actor). It is the responsibility of the base class to connect/disconnect registered visual to stage.
+ * @note Derived class should not call visual.SetOnScene(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.
  *
  * @see Visual::Base::GetDepthIndex()