From 5c892f574cb68906797b34cdf83e52c2055348f8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 6 Nov 2009 20:48:01 +0000 Subject: [PATCH] Recognize MSVC 10 in wx/platform.h. Define __VISUALC10__ for it and avoid a warning when building wx using it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/doxygen/mainpages/const_cpp.h | 2 +- include/wx/platform.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index c0d20c44bb..c5c8ecbfc2 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -169,7 +169,7 @@ compiler used. @c 1020 for @c 4.2 (the first supported version), @c 1100 for @c 5.0, @c 1200 for @c 6.0 and so on. For convenience, the symbols __VISUALCn__ are also defined for each major compiler version from - 5 to 9, i.e. you can use tests such @ifdef_ __VISUALC7__ to test + 5 to 10, i.e. you can use tests such @ifdef_ __VISUALC7__ to test for compiler version being precisely 7.} @itemdef{__XLC__, AIX compiler} @itemdef{__WATCOMC__, Watcom C++. The value of this macro corresponds to diff --git a/include/wx/platform.h b/include/wx/platform.h index 373b267bc5..957c26b2ae 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -544,8 +544,10 @@ # define __VISUALC8__ # elif __VISUALC__ < 1600 # define __VISUALC9__ +# elif __VISUALC__ < 1700 +# define __VISUALC10__ # else -# pragma message("Please update this code for the next VC++ version") +# pragma message("Please update wx/platform.h to recognize this VC++ version") # endif # elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__) -- 2.45.2