From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Mon, 9 Jan 2017 10:05:45 +0000 (-0800)
Subject: Merge "Fix the warning log in Control causing the wrong position" into devel/master
X-Git-Tag: dali_1.2.22~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=84d36f3df81b55d0c7ae20db8005a28742fa4060;hp=db152116b8c7de79b206d7d361c9d3875d05d0ac

Merge "Fix the warning log in Control causing the wrong position" into devel/master
---

diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp
index 415ffb6..b882c1d 100644
--- a/dali-toolkit/public-api/controls/control.cpp
+++ b/dali-toolkit/public-api/controls/control.cpp
@@ -109,8 +109,6 @@ const std::string& Control::GetStyleName() const
 
 void Control::SetBackgroundColor( const Vector4& color )
 {
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundColor() is deprecated and will be removed from next release. use Property::BACKGROUND instead.\n" );
-
   Internal::GetImplementation(*this).SetBackgroundColor( color );
 }
 
@@ -123,6 +121,8 @@ Vector4 Control::GetBackgroundColor() const
 
 void Control::SetBackgroundImage( Image image )
 {
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundImage() is deprecated and will be removed from next release. use Property::BACKGROUND instead.\n" );
+
   Internal::GetImplementation(*this).SetBackgroundImage( image );
 }