From 3c845b4ed098404469d6a99171de03bb549ae304 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Wed, 28 Sep 2016 11:59:19 +0100 Subject: [PATCH] [3.0]Deprecate the public APIs taking Image Handle as input Change-Id: I699b771167a097f611c6135dcf405df16112d2a5 --- 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 9acc84e..761fe7b 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -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 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 56b0f5f..3a3ddbc 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_8, 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_8, 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