[dali_1.9.23] Merge branch 'devel/master'

[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 e647d8a..39450c7 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.cpp
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,33 +27,31 @@ namespace Dali
 namespace Toolkit
 {
 
-const std::string TextLabel::RENDERING_BACKEND_PROPERTY_NAME("rendering-backend");
-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();
 }
 
-TextLabel::TextLabel()
+TextLabel TextLabel::New( const std::string& text )
 {
-}
+  TextLabel label = Internal::TextLabel::New();
+  label.SetProperty( TextLabel::Property::TEXT, text );
 
-TextLabel::TextLabel( const TextLabel& handle )
-: Control( handle )
-{
+  return label;
 }
 
-TextLabel& TextLabel::operator=( const TextLabel& handle )
+TextLabel::TextLabel()
 {
-  if( &handle != this )
-  {
-    Control::operator=( handle );
-  }
-  return *this;
 }
 
+TextLabel::TextLabel( const TextLabel& handle ) = default;
+
+TextLabel::TextLabel( TextLabel&& rhs ) = default;
+
+TextLabel& TextLabel::operator=( const TextLabel& handle ) = default;
+
+TextLabel& TextLabel::operator=( TextLabel&& rhs ) = default;
+
 TextLabel::~TextLabel()
 {
 }