made wxList methods return compatibility_iterator instead of Node * to further reduce...

[wxWidgets.git] / include / wx / msw / wrapwin.h

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 2814ef9d7164502117d81014981833e934a3c4eb..1e039d424de835ff03d073cc4758018ceadd9026 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
@@ -13,29 +13,62 @@
 
 #include "wx/platform.h"
 
+// strict type checking to detect conversion from HFOO to HBAR at compile-time
 #ifndef STRICT
     #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
-        // (Internet Explorer 6)
-        #define _WIN32_IE 0x600
+// this macro tells windows.h to not define min() and max() as macros: we need
+// this as otherwise they conflict with standard C++ functions
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX
+
+
+// before including windows.h, define version macros at (currently) maximal
+// values because we do all our checks at run-time anyhow
+#ifndef WINVER
+    // the only exception to the above is MSVC 6 which has a time bomb in its
+    // headers: they warn against using them with WINVER >= 0x0500 as they
+    // contain only part of the declarations and they're not always correct, so
+    // don't define WINVER for it at all as this allows everything to work as
+    // expected both with standard VC6 headers (which define WINVER as 0x0400
+    // by default) and headers from a newer SDK (which may define it as 0x0500)
+    #if !defined(__VISUALC__) || (__VISUALC__ >= 1300)
+        #define WINVER 0x0600
     #endif
-#endif // !defined(_WIN32_IE)
+#endif
+
+#ifndef _WIN32_WINNT
+    #define _WIN32_WINNT 0x0600
+#endif
+
+/* Deal with clash with __WINDOWS__ include guard */
+#if defined(__WXWINCE__) && defined(__WINDOWS__)
+#undef __WINDOWS__
+#endif
 
 #include <windows.h>
+
+#if defined(__WXWINCE__) && !defined(__WINDOWS__)
+#define __WINDOWS__
+#endif
+
+// #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
+
+// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability 
+// in the WINAPI SDK (they are an integral type that is the size of a
+// pointer) on MSVC 7 and later. However, they are not available in older 
+// Platform SDKs, and since they are typedefs and not #defines we simply 
+// overwrite them if there is a chance that they're not defined
+#if !defined(_MSC_VER) || (_MSC_VER < 1300)
+    #define UINT_PTR unsigned int
+    #define LONG_PTR long
+    #define ULONG_PTR unsigned long
+    #define DWORD_PTR unsigned long
+#endif // !defined(_MSC_VER) || _MSC_VER < 1300
+
 #endif // _WX_WRAPWIN_H_