added <windows.h> wrapper

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

include/wx/msw/private.h

@@ -14,11 +14,7 @@
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 
-#ifndef STRICT
-    #define STRICT 1
-#endif
-
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
 
 
 #if defined (__WXWINCE__)
@@ -32,9 +28,6 @@
     #include "wx/msw/microwin.h"
 #endif
 
-// undefine conflicting symbols which were defined in windows.h
-#include "wx/msw/winundef.h"
-
 // Include fixes for MSLU:
 #include "wx/msw/mslu.h"
 

include/wx/msw/wrapwin.h

@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wrapwin.h
+// Purpose:     Wrapper around <windows.h>, to be included instead of it
+// Created:     2003/07/22
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_WRAPWIN_H_
+#define _WX_WRAPWIN_H_
+
+#include "wx/platform.h"
+
+#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:
+#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__)
+        #if wxCHECK_W32API_VERSION(1,1)
+            #define _WIN32_IE 0x400
+        #endif
+    #else
+        #define _WIN32_IE 0x400
+    #endif
+#endif
+
+#include <windows.h>
+#include "wx/msw/winundef.h"
+
+#endif

include/wx/wxprec.h

@@ -38,8 +38,7 @@
         #define STRICT 1
     #endif
 
-    #include <windows.h>
-    #include "wx/msw/winundef.h"
+    #include "wx/msw/wrapwin.h"
 #endif
 
 // include the most common wx headers