Fix stc doxygen warnings and regen stc files.

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

diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 99ded721f8bfe233f42119bc7cd11040b4535ed4..c40ed6d0d5b4e1fa125734b7972234a926c992c6 100644 (file)
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxNativeWindow implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-03-05
 // Purpose:     wxNativeWindow implementation
 // Author:      Vadim Zeitlin
 // Created:     2008-03-05

-// RCS-ID:      $Id$

 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -96,7 +95,11 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowId anid)
 {
     bool rc;
 #ifdef __WXGTK3__
 {
     bool rc;
 #ifdef __WXGTK3__

+#ifdef GDK_WINDOWING_X11

     GdkWindow * const win = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), anid);
     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
 #else
     GdkWindow * const win = gdk_window_foreign_new(anid);
 #endif


@@ -121,6 +124,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