Revert "Removed the deprecated Dali::Internal::Adaptor::Window::ResizedSignal()."

[platform/core/uifw/dali-adaptor.git] / dali / public-api / adaptor-framework / window.cpp

diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp
index 3c5d6fa..000f350 100644 (file)
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -47,20 +47,23 @@ Window Window::New(PositionSize posSize, const std::string& name, const std::str
     isNewWindowAllowed = Internal::Adaptor::Adaptor::GetImplementation(adaptor).IsMultipleWindowSupported();
   }
 
-  if (!isNewWindowAllowed)
+  if (isNewWindowAllowed)
   {
-    DALI_LOG_ERROR("This device can't support multiple windows.\n");
-  }
-  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent);
+    Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent);
 
-  Integration::SceneHolder sceneHolder = Integration::SceneHolder(window);
+    Integration::SceneHolder sceneHolder = Integration::SceneHolder(window);
 
-  if (isAdaptorAvailable)
+    if (isAdaptorAvailable)
+    {
+      Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
+      Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder);
+    }
+    newWindow = Window(window);
+  }
+  else
   {
-    Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
-    Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder, name, className, isTransparent);
+    DALI_LOG_ERROR("This device can't support multiple windows.\n");
   }
-  newWindow = Window(window);
 
   return newWindow;
 }
@@ -73,16 +76,13 @@ Window::~Window()
 {
 }
 
-Window::Window(const Window& handle)
-: BaseHandle(handle)
-{
-}
+Window::Window( const Window& copy ) = default;
 
-Window& Window::operator=(const Window& rhs)
-{
-  BaseHandle::operator=(rhs);
-  return *this;
-}
+Window& Window::operator=( const Window& rhs ) = default;
+
+Window::Window( Window&& rhs ) = default;
+
+Window& Window::operator=( Window&& rhs ) = default;
 
 void Window::Add( Dali::Actor actor )
 {