Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / nativewin.h

diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h
index 60d94037cff1d42d27aa5d52ef46b66b4a9f623d..01007fdee67fd3d101dd00954c5bb50602fdaaab 100644 (file)
--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -39,9 +39,12 @@
     typedef HWND wxNativeContainerWindowId;
     typedef HWND wxNativeContainerWindowHandle;
 #elif defined(__WXGTK__)
-    #include <gdk/gdk.h>
-
-    typedef GdkNativeWindow wxNativeContainerWindowId;
+    // GdkNativeWindow is guint32 under GDK/X11 and gpointer under GDK/WIN32
+    #ifdef __UNIX__
+        typedef unsigned long wxNativeContainerWindowId;
+    #else
+        typedef void *wxNativeContainerWindowId;
+    #endif
     typedef GdkWindow *wxNativeContainerWindowHandle;
 #else
     // no support for using native windows under this platform yet