X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Ftext-controls%2Ftext-label.cpp;h=39450c7cc04e66c5e9324639b4b20aad7d72e5fe;hp=97e84853dc3b3804bd2881c542074d4348502103;hb=4593cc619ab0739fc8586c0c752209c555b0c8e3;hpb=10d2080e1d25b75347daa2f8c2dcee494fbcb175 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 97e8485..39450c7 100644 --- 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. @@ -32,24 +32,26 @@ 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() { }