From 9856829d769b0b44995a73ee1cbecd2b8926893f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 6 Apr 2003 14:06:36 +0000 Subject: [PATCH] Fix for explicit keyword detection (VC++) backported from head git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + include/wx/defs.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 06daca9cfd..9f779ab04d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -201,6 +201,7 @@ wxMSW: - no longer take ampersand into account in wxStaticText::GetBestSize - set orientation for scrollbar events +- fix for explicit keyword detection (VC++) wxMotif: diff --git a/include/wx/defs.h b/include/wx/defs.h index d28bdd0090..bd6de4e936 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -231,7 +231,7 @@ typedef int wxWindowID; // check for explicit keyword support #ifndef HAVE_EXPLICIT - #if defined(__VISUALC__) && (__VISUALC__ > 1200) + #if defined(__VISUALC__) && (__VISUALC__ >= 1200) // VC++ 6.0 has explicit (what about the earlier versions?) #define HAVE_EXPLICIT #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)