Disable wxUSE_ENH_METAFILE for wxGTK builds.

[wxWidgets.git] / src / gtk / nativewin.cpp

diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 4ed6675a70ffafe331c8d14f7c55463b07580931..91cb1ce6139c3bfa77ee22754dadbb765aa6a08a 100644 (file)
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -32,7 +32,7 @@
 #include "wx/gtk/private/gtk2-compat.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "wx/gtk/private/gtk2-compat.h"
 
 #ifdef GDK_WINDOWING_X11

-    #include <X11/Xlib.h>
+    #include <gdk/gdkx.h>

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -95,7 +95,15 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
 bool wxNativeContainerWindow::Create(wxNativeContainerWindowId anid)
 {
     bool rc;
 bool wxNativeContainerWindow::Create(wxNativeContainerWindowId anid)
 {
     bool rc;

+#ifdef __WXGTK3__
+#ifdef GDK_WINDOWING_X11
+    GdkWindow * const win = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), anid);
+#else
+    GdkWindow * const win = NULL;
+#endif
+#else

     GdkWindow * const win = gdk_window_foreign_new(anid);
     GdkWindow * const win = gdk_window_foreign_new(anid);

+#endif

     if ( win )
     {
         rc = Create(win);
     if ( win )
     {
         rc = Create(win);


@@ -117,6 +125,7 @@ void wxNativeContainerWindow::OnNativeDestroyed()
     // because it's a private GDK function and calling normal
     // gdk_window_destroy() results in X errors while nulling just the window
     // pointer and destroying m_widget results in many GTK errors
     // because it's a private GDK function and calling normal
     // gdk_window_destroy() results in X errors while nulling just the window
     // pointer and destroying m_widget results in many GTK errors

+    GTKDisconnect(m_widget);

     m_widget = NULL;
 
     // notice that we intentionally don't use Close() nor Delete() here as our
     m_widget = NULL;
 
     // notice that we intentionally don't use Close() nor Delete() here as our