X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f552802877a78b58e6c251466b70a10653aa585..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/msw/wrapwin.h?ds=sidebyside

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 48bed31c06..a9a927d839 100644
--- 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
@@ -17,24 +17,41 @@
     #define STRICT 1
 #endif
 
-// define _WIN32_IE to a high value because we always check for the version
-// of installed DLLs at runtime anyway unless the user really doesn't want it
-#ifndef _WIN32_IE
-    // for compilers that use w32api headers: w32api must be >= 1.1:
-    #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
-        defined( __CYGWIN__ ) || \
-        (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || \
-        defined(__DIGITALMARS__) && \
-        !wxCHECK_W32API_VERSION(1,1)
-        #define _WIN32_IE 0x300
-    #else
-        // highest known value at the time of this writing (Windows Server 2003)
-        #define _WIN32_IE 0x502
-    #endif
-#endif // !defined(_WIN32_IE)
+// don't define min() and max() as macros, they conflict with standard C++ ones
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX
 
 #include <windows.h>
+
+#ifdef __WXWINCE__
+    // this doesn't make any sense knowing that windows.h includes all these
+    // headers anyhow, but the fact remains that when building using eVC 4 the
+    // functions and constants from these headers are not defined unless we
+    // explicitly include them ourselves -- how is it possible is beyond me...
+    #include <winbase.h>
+    #include <wingdi.h>
+    #include <winuser.h>
+
+    // this one OTOH contains many useful CE-only functions
+    #include <shellapi.h>
+#endif // __WXWINCE__
+
 #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
+#if !defined(__WIN64__) && !defined(__WXWINCE__)
+    #define UINT_PTR unsigned int
+    #define ULONG_PTR unsigned long
+    #define DWORD_PTR unsigned long
+#endif // !__WIN64__
+
 #endif // _WX_WRAPWIN_H_