From: Vadim Zeitlin Date: Tue, 7 Jun 2005 20:19:37 +0000 (+0000) Subject: don't define WINVER in platform.h, do it in wrapwin.h and always define it as 0x0600... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1033b8362a644a89d3b82b8786e1f6790c066bb5 don't define WINVER in platform.h, do it in wrapwin.h and always define it as 0x0600 (current max) 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 72c0d8cd17..c458c326a3 100644 --- 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 #ifdef __WXWINCE__ diff --git a/include/wx/platform.h b/include/wx/platform.h index 21a063a943..6bb277a2bf 100644 --- 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 */