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=073d1ac17e0c7c99482ea4177d7f3ea673b960bf;hp=ab29fc96f15e1a099fdf2a867d134dcc5562a690;hb=43304152ae02a473296e85846bf8c1b08bd918ac;hpb=1db0a8becea3dbdebaa942d934d91824a92434e7

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 ab29fc9..073d1ac 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -22,6 +22,7 @@
 #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>
+#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
 
 namespace Dali
 {
@@ -35,7 +36,7 @@ namespace Internal
 /**
  * @brief A control which renders a short text string.
  */
-class TextLabel : public Control
+class TextLabel : public Control, public Text::ControlInterface
 {
 public:
 
@@ -51,11 +52,6 @@ public:
    */
   static Toolkit::TextLabel New();
 
-  /**
-   * @copydoc Dali::Toollkit::TextLabel::SetRenderer()
-   */
-  void SetRenderer( Text::RendererPtr renderer );
-
   // Properties
 
   /**
@@ -96,19 +92,12 @@ private: // From Control
    */
   virtual float GetHeightForWidth( float width );
 
-private: // Implementation
-
   /**
-   * Helper for SetProperty.
-   * @param[in] text The new "text" property value.
+   * @copydoc Text::ControlInterface::RequestTextRelayout()
    */
-  void SetText( const std::string& text );
+  virtual void RequestTextRelayout();
 
-  /**
-   * Helper for SetProperty.
-   * @param[in] multiLine The new "multi-line" property value.
-   */
-  void SetMultiLine( bool multiLine );
+private: // Implementation
 
   /**
    * Construct a new TextLabel.
@@ -130,6 +119,8 @@ private: // Data
 
   Text::ControllerPtr mController;
   Text::RendererPtr mRenderer;
+
+  unsigned int mRenderingBackend;
 };
 
 } // namespace Internal