don't define WINVER in platform.h, do it in wrapwin.h and always define it as 0x0600...

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 72c0d8cd176ff036a4150991e5c30cb474581009..c458c326a3319d616804e162acf0634686bd9f17 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -22,6 +22,15 @@
     #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 _WIN32_WINNT
+    #define _WIN32_WINNT 0x0600
+#endif
+#ifndef WINVER
+    #define WINVER 0x0600
+#endif
+
 #include <windows.h>
 
 #ifdef __WXWINCE__

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 21a063a94396e461b5c840b07ce640b8a38d6ae8..6bb277a2bf538f911a7ca66a542070957b84a4fc 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -119,50 +119,8 @@
 #        define __WIN32__
 #    endif
 
-    /*
-        The library user may override the default setting of WINVER by defining
-        it in his own makefile or project file -- if it is defined, we don't
-        touch it at all.
-
-        It makes sense to define WINVER as:
-            - either some lowish value (e.g. 0x0302) to not even compile in the
-              features not available in Windows version lower than some given
-              one
-            - or to a higher value than the one used by default for the given
-              compiler if you updated its headers to newer version of Platform
-              SDK, e.g. VC6 ships with 0x0400 headers by default but may also
-              work with 0x0500 headers and beyond
-    */
-#   ifndef WINVER
-#       if defined(_MSC_VER) && _MSC_VER < 1300
-            /*
-                VC6 defines some stuff in its default headers which is normally
-                only present if WINVER >= 0x0500 (FLASHW_XXX constants) which
-                means that our usual tests not involving WINVER sometimes fail
-                with it, hence explicitly define a lower WINVER value for it.
-             */
-#           define WINVER 0x0400
-#       elif defined(__DMC__)
-            /*
-                Digital Mars is distributed with a little outdated headers.
-             */
-#           define WINVER 0x0400
-#       else /* !VC++ 6 */
-            /*
-               see MSDN for the description of possible WINVER values, this one
-               is the highest one defined right now (Windows Server 2003) and
-               we use it unless it was explicitly overridden by the user to
-               disable recent features support as we check for all of the
-               features we use which could be not available on earlier Windows
-               systems during run-time anyhow, so there is almost no
-               disadvantage in using it.
-             */
-#           define WINVER 0x0502
-#       endif /* VC++ 6/!VC++6 */
-#   endif
-
-    /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */
-#    if !defined(__WIN95__) && (WINVER >= 0x0400)
+    /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */
+#    if !defined(__WIN95__)
 #        define __WIN95__
 #    endif
 #endif /* Win32 */