Merge "Use orientation from Window not application" into tizen

diff --git a/dali-toolkit/public-api/controls/view/view.h b/dali-toolkit/public-api/controls/view/view.h
index 99bcc31..b42340c 100644 (file)
--- a/dali-toolkit/public-api/controls/view/view.h
+++ b/dali-toolkit/public-api/controls/view/view.h
@@ -63,7 +63,7 @@ class View;
  * mView.SetBackground( backgroundImageActor );
  *
  * // Connects the orientation signal with the View::OrientationChanged method.
- * application.GetOrientation().ChangedSignal().Connect( &view, &Toolkit::View::OrientationChanged );
+ * application.GetWindow().GetOrientation().ChangedSignal().Connect( &view, &Toolkit::View::OrientationChanged );
  *
  * // Create a content layer.
  * Layer contentLayer = Layer::New();

diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h
index f7f22a6..2d19f4b 100644 (file)
--- a/dali-toolkit/public-api/styling/style-manager.h
+++ b/dali-toolkit/public-api/styling/style-manager.h
@@ -51,7 +51,7 @@ class StyleManager;
  *   void OnInit(Application& app)
  *   {
  *      Toolkit::StyleManager::Get().RequestThemeChange( CUSTOM_THEME );
- *      Toolkit::StyleManager::Get().SetOrientation( app.GetOrientation() );
+ *      Toolkit::StyleManager::Get().SetOrientation( app.GetWindow().GetOrientation() );
  *      ...
  *   }
  * @endcode