X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.cpp;h=fdce0edd128a975980a20c090843e48cc7711aa2;hb=3b1fb566901d21b8303d9be3308e3920f5182e6d;hp=2de2c572de0aae3f73a8045a449abd6ce8e2658a;hpb=f384d637fc0bfd41b4b93221f246719904501c57;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 2de2c57..fdce0ed 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -26,17 +26,11 @@ // INTERNAL INCLUDES #include #include +#include using Dali::Toolkit::Text::LayoutEngine; using Dali::Toolkit::Text::Backend; -namespace -{ - -const unsigned int DEFAULT_RENDERING_BACKEND = 0; - -} // namespace - namespace Dali { @@ -48,6 +42,11 @@ namespace Internal namespace { + const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND; +} + +namespace +{ // Type registration BaseHandle Create() @@ -95,11 +94,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { case Toolkit::TextLabel::Property::RENDERING_BACKEND: { - unsigned int backend = value.Get< int >(); + int backend = value.Get< int >(); if( impl.mRenderingBackend != backend ) { - impl.mRenderingBackend = static_cast< unsigned int >( backend ); + impl.mRenderingBackend = backend; impl.mRenderer.Reset(); impl.RequestTextRelayout(); }