Merge "Update with the change of Orientation in adaptor" into tizen
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Fri, 22 May 2015 18:16:21 +0000 (11:16 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 22 May 2015 18:16:21 +0000 (11:16 -0700)
1  2 
dali-toolkit/devel-api/styling/style-manager.h

@@@ -18,7 -18,7 +18,7 @@@
   */
  
  // EXTERNAL INCLUDES
- #include <dali/public-api/adaptor-framework/orientation.h>
+ #include <dali/devel-api/adaptor-framework/orientation.h>
  #include <dali/public-api/adaptor-framework/style-change.h>
  
  // INTERNAL INCLUDES
@@@ -51,7 -51,7 +51,7 @@@ class StyleManager
   *   void OnInit(Application& app)
   *   {
   *      Toolkit::StyleManager::Get().RequestThemeChange( CUSTOM_THEME );
-  *      Toolkit::StyleManager::Get().SetOrientation( app.GetWindow().GetOrientation() );
+  *      Toolkit::StyleManager::Get().SetOrientation( ... );
   *      ...
   *   }
   * @endcode
@@@ -64,7 -64,7 +64,7 @@@ class DALI_IMPORT_API StyleManager : pu
  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()