Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / text-controls / text-label.cpp

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.cpp b/dali-toolkit/public-api/controls/text-controls/text-label.cpp
index 15bb52c..97e8485 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.cpp
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.cpp
@@ -27,9 +27,6 @@ namespace Dali
 namespace Toolkit
 {
 
-const std::string TextLabel::TEXT_PROPERTY_NAME("text");
-const std::string TextLabel::MULTI_LINE_PROPERTY_NAME("multi-line");
-
 TextLabel TextLabel::New()
 {
   return Internal::TextLabel::New();
@@ -62,11 +59,6 @@ TextLabel TextLabel::DownCast( BaseHandle handle )
   return Control::DownCast<TextLabel, Internal::TextLabel>(handle);
 }
 
-void TextLabel::SetRenderer( Text::RendererPtr renderer )
-{
-  GetImpl(*this).SetRenderer( renderer );
-}
-
 TextLabel::TextLabel( Internal::TextLabel& implementation )
 : Control(implementation)
 {