Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / dali / integration-api / adaptor.h

diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptor.h
index cb19fa0..eb0f6f0 100755 (executable)
--- a/dali/integration-api/adaptor.h
+++ b/dali/integration-api/adaptor.h
@@ -52,6 +52,8 @@ namespace Integration
 class SceneHolder;
 }
 
+using SceneHolderList = std::vector<Dali::Integration::SceneHolder>;
+
 
 namespace Internal
 {
@@ -125,7 +127,7 @@ class DALI_ADAPTOR_API Adaptor
 public:
 
   typedef Signal< void (Adaptor&) > AdaptorSignalType; ///< Generic Type for adaptor signals
-  typedef Signal< void (Window&) > WindowCreatedSignalType;  ///< Window created signal type
+  typedef Signal< void (Dali::Integration::SceneHolder&) > WindowCreatedSignalType;  ///< SceneHolder created signal type
 
   using SurfaceSize = Uint16Pair; ///< Surface size type
 
@@ -469,6 +471,12 @@ public:
   Dali::WindowContainer GetWindows() const;
 
   /**
+   * @brief Get the list of scene holders.
+   * @return The list of scene holers
+   */
+  SceneHolderList GetSceneHolders() const;
+
+  /**
    * @brief Called when the window becomes fully or partially visible.
    */
   void OnWindowShown();
@@ -496,7 +504,7 @@ public:  // Signals
   AdaptorSignalType& LanguageChangedSignal();
 
   /**
-   * @brief This signal is emitted when a new window is created
+   * @brief This signal is emitted when a new window (scene holder) is created
    *
    * @return The signal to connect to
    */