X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.h;h=3ea01f20c24b70fec1e84f581f3d39cae4828f54;hp=53bddf2920bae4b4f760c30371fa15ca4b52c2de;hb=20d79594120aa5db8769cff09a021e9641655bec;hpb=fc043d6d5ed6561deb09ac1c0b92134f9807518d

diff --git a/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index 53bddf2..3ea01f2 100644
--- a/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -21,6 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/public-api/text/text-controller.h>
 
 namespace Dali
 {
@@ -80,9 +81,26 @@ private: // From Control
    */
   virtual void OnInitialize();
 
+  /**
+   * @copydoc Control::OnInitialize()
+   */
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+
 private: // Implementation
 
   /**
+   * Helper for SetProperty.
+   * @param[in] text The new "text" property value.
+   */
+  void SetText( const std::string& text );
+
+  /**
+   * Helper for SetProperty.
+   * @param[in] multiLine The new "multi-line" property value.
+   */
+  void SetMultiLine( bool multiLine );
+
+  /**
    * Construct a new TextLabel.
    */
   TextLabel();
@@ -100,9 +118,8 @@ private:
 
 private: // Data
 
-  // TODO - Use Controller/Model for storage
+  Text::ControllerPtr mController;
   Text::RendererPtr mRenderer;
-  std::string mText;
 };
 
 } // namespace Internal