X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.h;h=f91a036953c32811cf532eab07b24c245bf6b153;hb=caf7677175a0e8b9c690d4f2ab73adc295f22c0e;hp=157e56b920b25609b970bf816b582c6f0ad8fba3;hpb=ed59234dddddba1caa4acecc638c0ad6b8a9150b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 157e56b..f91a036 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -89,6 +89,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the Control class. + * @SINCE_1_0.0 + */ enum { /** @@ -117,7 +121,7 @@ public: */ KEY_INPUT_FOCUS, /** - * @brief name "background", mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE, type Map + * @brief name "background", mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE, type Map or std::string for URL * @SINCE_1_1.3 */ BACKGROUND, @@ -326,17 +330,17 @@ public: * @SINCE_1_0.0 * @return The background color of the control. */ - Vector4 GetBackgroundColor() const; + Vector4 GetBackgroundColor() const DALI_DEPRECATED_API; /** - * @DEPRECATED_1_2.8, use Property::BACKGROUND instead + * @DEPRECATED_1_2_8, use Property::BACKGROUND instead * * @brief Sets an image as the background of the control. * * @SINCE_1_0.0 * @param[in] image The image to set as the background. */ - void SetBackgroundImage( Image image ); + void SetBackgroundImage( Image image ) DALI_DEPRECATED_API; /** * @brief Clears the background.