X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.h;h=c612f7d32800cb2f718a3e46c21c63886b166c34;hp=4e3cc56e53417034d663a01afb72b3dd43ba152a;hb=27466c9803e1305dd94eccdb848f7ba66bf8af00;hpb=f58b8383147de70affa1e3949cf1c6757d705d3c diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h index 4e3cc56..c612f7d 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.h +++ b/dali-toolkit/internal/styling/style-manager-impl.h @@ -19,7 +19,7 @@ // EXTERNAL INCLUDES #include -#include +#include #include #include #include @@ -140,7 +140,7 @@ public: private: - typedef std::list StringList; + typedef std::vector StringList; /** * @brief Internal helper method to read a file from file system. @@ -222,9 +222,9 @@ private: * Callback for when style monitor raises a signal * * @param[in] styleMonitor The style monitor object - * @param[in] styleChange The style change data + * @param[in] styleChange The style change type */ - void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange ); + void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange ); // Undefined StyleManager(const StyleManager&); @@ -237,6 +237,7 @@ private: typedef std::map< std::string, Toolkit::Builder > BuilderMap; Toolkit::Builder mThemeBuilder; ///< Builder for all default theme properties + StyleMonitor mStyleMonitor; ///< Style monitor handle Orientation mOrientation; ///< Handle to application orientation object int mOrientationDegrees; ///< Directly set value of orientation