Merge "Fix prevent issues" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / styling / style-manager.h

diff --git a/dali-toolkit/devel-api/styling/style-manager.h b/dali-toolkit/devel-api/styling/style-manager.h
index a171740..a1596e1 100644 (file)
--- a/dali-toolkit/devel-api/styling/style-manager.h
+++ b/dali-toolkit/devel-api/styling/style-manager.h
@@ -64,7 +64,7 @@ class DALI_IMPORT_API StyleManager : public BaseHandle
 public:
 
   // Signals
-  typedef Signal< void ( StyleManager, StyleChange ) >  StyleChangeSignalType;
+  typedef Signal< void ( StyleManager, StyleChange::Type ) >  StyleChangeSignalType;
 
   /**
    * @brief Create a StyleManager handle; this can be initialised with StyleManager::Get()
@@ -115,6 +115,12 @@ public:
   Orientation GetOrientation();
 
   /**
+   * @brief Retrieves the default font family.
+   * @return The default font family.
+   */
+  std::string GetDefaultFontFamily() const;
+
+  /**
    * @brief Make a request to set the theme JSON file to one that exists in the Toolkit package.
    *
    * Multiple requests per event processing cycle can be made, but only the final one will be acted