Fix a number of mingw compile errors.

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

diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 8647cc0aca100ccb08de341e6c492f0aee7ab8ec..4ed6675a70ffafe331c8d14f7c55463b07580931 100644 (file)
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -29,6 +29,7 @@
 #include "wx/nativewin.h"
 
 #include <gtk/gtk.h>
 #include "wx/nativewin.h"
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private/gtk2-compat.h"

 
 #ifdef GDK_WINDOWING_X11
     #include <X11/Xlib.h>
 
 #ifdef GDK_WINDOWING_X11
     #include <X11/Xlib.h>


@@ -71,7 +72,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
 
     // we need to realize the window first before reparenting it
     gtk_widget_realize(m_widget);
 
     // we need to realize the window first before reparenting it
     gtk_widget_realize(m_widget);

-    gdk_window_reparent(m_widget->window, win, 0, 0);
+    gdk_window_reparent(gtk_widget_get_window(m_widget), win, 0, 0);

 
 #ifdef GDK_WINDOWING_X11
     // if the native window is destroyed, our own window will be destroyed too
 
 #ifdef GDK_WINDOWING_X11
     // if the native window is destroyed, our own window will be destroyed too


@@ -79,7 +80,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
     // destroyed" GdkWindow, so intercept to DestroyNotify ourselves to fix
     // this and also destroy the associated C++ object when its window is
     // destroyed
     // destroyed" GdkWindow, so intercept to DestroyNotify ourselves to fix
     // this and also destroy the associated C++ object when its window is
     // destroyed

-    gdk_window_add_filter(m_widget->window, wxNativeContainerWindowFilter, this);
+    gdk_window_add_filter(gtk_widget_get_window(m_widget), wxNativeContainerWindowFilter, this);

 #endif // GDK_WINDOWING_X11
 
     // we should be initially visible as we suppose that the native window we
 #endif // GDK_WINDOWING_X11
 
     // we should be initially visible as we suppose that the native window we