From d379c4d91c6596f6d992798d3c6543c4e2303dcd Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 15 Nov 2016 11:29:13 +0900 Subject: [PATCH] Revert "[3.0]Deprecate the public APIs taking Image Handle as input" This reverts commit 3c845b4ed098404469d6a99171de03bb549ae304. Change-Id: Ib825ebab9901ab2708c7409f25e84f077b7fd55c --- dali-toolkit/public-api/controls/control.h | 2 -- dali-toolkit/public-api/controls/image-view/image-view.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 761fe7b..9acc84e 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -329,8 +329,6 @@ 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 3a3ddbc..56b0f5f 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -125,8 +125,6 @@ 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. @@ -202,8 +200,6 @@ 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