projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e647d8a
..
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,10
+27,6
@@
namespace Dali
namespace Toolkit
{
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::New()
{
return Internal::TextLabel::New();