Invalid conversion compile error fix (GTK+ 2.12.9)

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

diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 99ded721f8bfe233f42119bc7cd11040b4535ed4..91cb1ce6139c3bfa77ee22754dadbb765aa6a08a 100644 (file)
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -96,7 +96,11 @@ 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);
 #endif
@@ -121,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
+    GTKDisconnect(m_widget);
     m_widget = NULL;
 
     // notice that we intentionally don't use Close() nor Delete() here as our