Fix some wrong code: add parentheses to correct precedence,

fix comment and _WIN32_IE value (author was probably thinking about
_WIN32_WINNT. Now CVS compiles again with MinGW.

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 48bed31c066d49c912d06b39def0e75436023f09..2814ef9d7164502117d81014981833e934a3c4eb 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -21,15 +21,16 @@
 // 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:
 // 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__ ) || \
+    #if (defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \

         defined( __CYGWIN__ ) || \
         (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || \
         defined( __CYGWIN__ ) || \
         (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || \

-        defined(__DIGITALMARS__) && \
+        defined(__DIGITALMARS__)) && \

         !wxCHECK_W32API_VERSION(1,1)
         #define _WIN32_IE 0x300
     #else
         !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
+        // highest known value at the time of this writing
+        // (Internet Explorer 6)
+        #define _WIN32_IE 0x600

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