X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.h;h=86ea6078b4f2b296984aa15aa4cf9cb6b4ffc19e;hp=d35402fdf0aa96778be807dd34eaa8316027e51e;hb=c6eb78824e08f7a863c55b3599d37b641c0313ba;hpb=c4699b9f5bd574bf545151f88ea05693467fb5dd diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index d35402f..86ea607 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -117,7 +117,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, @@ -329,6 +329,8 @@ public: Vector4 GetBackgroundColor() const; /** + * @DEPRECATED_1_2.8, use Property::BACKGROUND instead + * * @brief Sets an image as the background of the control. * * @SINCE_1_0.0