X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.h;h=c72c9c5206e53afee3f4f5e441e9ca0462bd12a5;hp=b0c22322f129829404e4be9839680b868116f6e8;hb=e979409480340033e0154a43bb1cbeeeb8d1c6a3;hpb=830f03638ec6ecd3b12ba3d9eb6419fdb3a3db09 diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h index b0c2232..c72c9c5 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h @@ -40,13 +40,6 @@ class TextLabel : public Control, public Text::ControlInterface { public: - // Properties - enum - { - TEXTLABEL_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, - TEXTLABEL_PROPERTY_END_INDEX = TEXTLABEL_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices - }; - /** * @copydoc Dali::Toollkit::TextLabel::New() */ @@ -55,7 +48,8 @@ public: // Properties /** - * Called when a property of an object of this type is set. + * @brief Called when a property of an object of this type is set. + * * @param[in] object The object whose property is set. * @param[in] index The property index. * @param[in] value The new property value. @@ -63,7 +57,8 @@ public: static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ); /** - * Called to retrieve a property of an object of this type. + * @brief Called to retrieve a property of an object of this type. + * * @param[in] object The object whose property is to be retrieved. * @param[in] index The property index. * @return The current value of the property. @@ -119,8 +114,9 @@ private: // Data Text::ControllerPtr mController; Text::RendererPtr mRenderer; + RenderableActor mRenderableActor; - unsigned int mRenderingBackend; + int mRenderingBackend; }; } // namespace Internal