useh higher value of _WIN32_IE

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 84141ec67b1741e00a44280fdf7532d7174e7893..48bed31c066d49c912d06b39def0e75436023f09 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -1,8 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wrapwin.h
 // Purpose:     Wrapper around <windows.h>, to be included instead of it
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wrapwin.h
 // Purpose:     Wrapper around <windows.h>, to be included instead of it

+// Author:      Vaclav Slavik

 // Created:     2003/07/22
 // RCS-ID:      $Id$
 // Created:     2003/07/22
 // RCS-ID:      $Id$

+// Copyright:   (c) 2003 Vaclav Slavik

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -16,22 +18,23 @@
 #endif
 
 // define _WIN32_IE to a high value because we always check for the version
 #endif
 
 // define _WIN32_IE to a high value because we always check for the version

-// of installed DLLs at runtime anyway:
+// 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) || \
 #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
+        defined(__DIGITALMARS__) && \
+        !wxCHECK_W32API_VERSION(1,1)
+        #define _WIN32_IE 0x300

     #else
     #else

-        #define _WIN32_IE 0x400
+        // highest known value at the time of this writing (Windows Server 2003)
+        #define _WIN32_IE 0x502

     #endif
     #endif

-#endif
+#endif // !defined(_WIN32_IE)

 
 #include <windows.h>
 #include "wx/msw/winundef.h"
 
 
 #include <windows.h>
 #include "wx/msw/winundef.h"
 

-#endif
+#endif // _WX_WRAPWIN_H_
+