Merge "Remove orientation from application class" into tizen

[platform/core/uifw/dali-adaptor.git] / adaptors / x11 / clipboard-impl-x.cpp

diff --git a/adaptors/x11/clipboard-impl-x.cpp b/adaptors/x11/clipboard-impl-x.cpp
index 3d0f0f9..fdb3650 100644 (file)
--- a/adaptors/x11/clipboard-impl-x.cpp
+++ b/adaptors/x11/clipboard-impl-x.cpp
@@ -20,11 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <Ecore_X.h>
-#include <dali/public-api/dali-core.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/object/any.h>
 #include <adaptor-impl.h>
 #include <ecore-x-window-interface.h>
 #include <singleton-service-impl.h>
@@ -66,22 +66,24 @@ BaseHandle Create()
     if ( service )
     {
       Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) );
+      Any nativewindow = adaptorImpl.GetNativeWindowHandle();
 
       // The Ecore_X_Window needs to use the Clipboard.
       // Only when the render surface is window, we can get the Ecore_X_Window.
-      Ecore_X_Window ecoreXwin( 0 );
-      Dali::RenderSurface& surface( adaptorImpl.GetSurface() );
-      if( surface.GetType() == Dali::RenderSurface::WINDOW )
+      Ecore_X_Window ecoreXwin( AnyCast<Ecore_X_Window>(nativewindow) );
+      if (ecoreXwin)
       {
-        ecoreXwin = AnyCast< Ecore_X_Window >( adaptorImpl.GetSurface().GetSurface() );
+        // If we fail to get Ecore_X_Window, we can't use the Clipboard correctly.
+        // Thus you have to call "ecore_imf_context_client_window_set" somewhere.
+        // In EvasPlugIn, this function is called in EvasPlugin::ConnectEcoreEvent().
+        Dali::Clipboard clipboard = Dali::Clipboard( new Clipboard( ecoreXwin ) );
+        service.Register( typeid( clipboard ), clipboard );
+        handle = clipboard;
+      }
+      else
+      {
+        DALI_LOG_ERROR("Failed to get native window handle");
       }
-
-      // If we fail to get Ecore_X_Window, we can't use the Clipboard correctly.
-      // Thus you have to call "ecore_imf_context_client_window_set" somewhere.
-      // In EvasPlugIn, this function is called in EvasPlugin::ConnectEcoreEvent().
-      Dali::Clipboard clipboard = Dali::Clipboard( new Clipboard( ecoreXwin ) );
-      service.Register( typeid( clipboard ), clipboard );
-      handle = clipboard;
     }
   }