X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.h;h=095543147b1c2e5af8b072668d02e677403f1e64;hb=69669144df0027a66725f167fd1b99e12b8860ad;hp=3c6125dd77694f13c813a34ef15f28cc7defa3b3;hpb=bcbdc0b7654fb74b6527ee371deb61257abcf7a9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
index 3c6125d..0955431 100644
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -114,6 +114,24 @@ public:
   void EnableTextInput( DecoratorPtr decorator );
 
   /**
+   * @brief Enables/disables the mark-up processor.
+   *
+   * By default is disabled.
+   *
+   * @param[in] enable Whether to enable the mark-up processor.
+   */
+  void SetMarkupProcessorEnabled( bool enable );
+
+  /**
+   * @brief Retrieves whether the mark-up processor is enabled.
+   *
+   * By default is disabled.
+   *
+   * @return @e true if the mark-up processor is enabled, otherwise returns @e false.
+   */
+  bool IsMarkupProcessorEnabled() const;
+
+  /**
    * @brief Replaces any text previously set.
    *
    * @note This will be converted into UTF-32 when stored in the text model.
@@ -178,9 +196,8 @@ public:
    * @brief Set the default font family.
    *
    * @param[in] defaultFontFamily The default font family.
-   * @param[in] userDefined If set by the user
    */
-  void SetDefaultFontFamily( const std::string& defaultFontFamily, bool userDefined );
+  void SetDefaultFontFamily( const std::string& defaultFontFamily );
 
   /**
    * @brief Retrieve the default font family.