define DWORD_PTR &c for Win32 compilation whatever headers we use

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 7d93fe701a338c89fbd4fa9e048677302e448097..f723f1bf994b918db69ef31a707846b91db183dd 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wrapwin.h
+// Name:        msw/wrapwin.h
 // Purpose:     Wrapper around <windows.h>, to be included instead of it
 // Author:      Vaclav Slavik
 // Created:     2003/07/22
@@ -20,5 +20,19 @@
 #include <windows.h>
 #include "wx/msw/winundef.h"
 
+// types DWORD_PTR, ULONG_PTR and so on might be not defined in old headers but
+// unfortunately I don't know of any standard way to test for this (as they're
+// typedefs and not #defines), so simply overwrite them in any case in Win32
+// mode -- and if compiling for Win64 they'd better have new headers anyhow
+//
+// this is ugly but what else can we do? even testing for compiler version
+// wouldn't help as you can perfectly well be using an older compiler (VC6)
+// with newer SDK headers
+#ifndef __WIN64__
+    #define UINT_PTR unsigned int
+    #define ULONG_PTR unsigned long
+    #define DWORD_PTR unsigned long
+#endif // !__WIN64__
+
 #endif // _WX_WRAPWIN_H_