From 6df04e225709cff7cb675a9bf27df694bea7361c Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Tue, 20 Sep 2016 14:29:46 +0100 Subject: [PATCH] Deprecate the public APIs taking Image as input Change-Id: I2f03dcb3a37e70692448e3176aacb6dd0de55acf --- dali-toolkit/public-api/controls/control.h | 2 ++ dali-toolkit/public-api/controls/image-view/image-view.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index cdeee6b..a52b467 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -325,6 +325,8 @@ public: Vector4 GetBackgroundColor() const; /** + * @DEPRECATED_1_2.7, use Property::BACKGROUND instead + * * @brief Sets an image as the background of the control. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h index 51489c9..0c8c520 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -125,6 +125,8 @@ public: static ImageView New(); /** + * @DEPRECATED_1_2.7, use New( const std::string& ) instead. + * * @brief Create an initialized ImageView from an Image instance. * * If the handle is empty, ImageView will not display anything. @@ -200,6 +202,8 @@ public: static ImageView DownCast( BaseHandle handle ); /** + * @DEPRECATED_1_2.7, use SetImage( const std::string& ) instead. + * * @brief Sets this ImageView from an Image instance. * * If the handle is empty, ImageView will display nothing -- 2.7.4