Merge "Fix a crash in ImageVisual in case of an invalid image and changed to render...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-font-style.h

diff --git a/dali-toolkit/internal/text/text-font-style.h b/dali-toolkit/internal/text/text-font-style.h
index b87a8c9..e74bcfb 100644 (file)
--- a/dali-toolkit/internal/text/text-font-style.h
+++ b/dali-toolkit/internal/text/text-font-style.h
@@ -23,7 +23,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {
@@ -90,10 +89,19 @@ namespace FontStyle
 };
 
 /**
+ * @brief Sets the font family property.
+ *
+ * @param[in] controller The text's controller.
+ * @param[in] value The value of the font's family.
+ */
+void SetFontFamilyProperty( ControllerPtr controller, const Property::Value& value );
+
+/**
  * @brief Sets the font's style property.
  *
  * @param[in] controller The text's controller.
  * @param[in] value The value of the font's style.
+ * @param[in] type Whether the property is for the default font's style or the input font's style.
  *
  */
 void SetFontStyleProperty( ControllerPtr controller, const Property::Value& value, FontStyle::Type type );
@@ -103,6 +111,7 @@ void SetFontStyleProperty( ControllerPtr controller, const Property::Value& valu
  *
  * @param[in] controller The text's controller.
  * @param[out] value The value of the font's style.
+ * @param[in] type Whether the property is for the default font's style or the input font's style.
  */
 void GetFontStyleProperty( ControllerPtr controller, Property::Value& value, FontStyle::Type type );