From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Jul 2012 23:52:14 +0000 (+0000)
Subject: Fix wxNativeContainerWindowId definition for wxGTK/Windows port.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/98b6b5abc5552adbc0c759a587a8b7f597c47246?ds=inline

Fix wxNativeContainerWindowId definition for wxGTK/Windows port.

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
---

diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h
index 6571149755..01007fdee6 100644
--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -39,7 +39,12 @@
     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