]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix wxNativeContainerWindowId definition for wxGTK/Windows port.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 10 Jul 2012 23:52:14 +0000 (23:52 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 10 Jul 2012 23:52:14 +0000 (23:52 +0000)
It's a gpointer and not unsigned long as under Unix in this case.

Closes #14447.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/nativewin.h

index 6571149755ff7a16d3ce1af89e1793bf723917d2..01007fdee67fd3d101dd00954c5bb50602fdaaab 100644 (file)
     typedef HWND wxNativeContainerWindowId;
     typedef HWND wxNativeContainerWindowHandle;
 #elif defined(__WXGTK__)
-    typedef unsigned long 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