[3.0] (button) Downgrade warning level of setting Label Text APIs to only show with...

Change-Id: I9c7b02d952ba8b9513b212f2bcd47ecd6d69d279
Signed-off-by: minho.sun <minho.sun@samsung.com>

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index 783e1e6..53c1979 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -157,7 +157,7 @@ float Button::GetAnimationTime() const
 
 void Button::SetLabelText( const std::string& label )
 {
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetLabelText() is deprecated and will be removed from next release. Use SetProperty LABEL or Styling file instead.\n" );
+  DALI_LOG_WARNING("DEPRECATION WARNING: SetLabelText() is deprecated and will be removed from next release. Use SetProperty LABEL or Styling file instead.\n" );
 
   Dali::Toolkit::GetImplementation( *this ).SetLabelText( label );
 }

diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h
index 45a517a..3d750a1 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.h
+++ b/dali-toolkit/public-api/controls/buttons/button.h
@@ -326,8 +326,6 @@ public:
   float GetAnimationTime() const DALI_DEPRECATED_API;
 
   /**
-   * @DEPRECATED_1_1.32 SetProperty LABEL or Styling file
-   *
    * @brief Sets the button's label.
    *
    * @SINCE_1_0.0