From 7863fab40d6a76cabc0558c2fb0b3e1119c199d5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 May 2003 00:13:20 +0000 Subject: [PATCH] #define WINVER as 0x400 if it is not defined at all git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/platform.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/wx/platform.h b/include/wx/platform.h index 0471d18605..0f9f485fae 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -21,14 +21,8 @@ */ #if __MWERKS__ #include - #if defined(WIN32) || defined(_WIN32) - #ifndef WINVER - #define WINVER 0x0400 - #endif - #endif #endif - /* first define Windows symbols if they're not defined on the command line: we can autodetect everything we need if _WIN32 is defined @@ -58,8 +52,17 @@ #define __WIN32__ #endif + /* + see MSDN for the description of possible WINVER values, this one is a + good default and, anyhow, we check for most of the features we use + during run-time. + */ + #ifndef WINVER + #define WINVER 0x0400 + #endif + /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */ - #if !defined(__WIN95__) && defined(WINVER) && (WINVER >= 0x0400) + #if !defined(__WIN95__) && (WINVER >= 0x0400) #define __WIN95__ #endif #endif /* Win32 */ -- 2.45.2