From cc16513e28a9a3084eee4b32529cde19d1760f0d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 6 Apr 2010 13:55:30 +0000 Subject: [PATCH] Correct check for MSVC version in wxUSE_GRAPHICS_CONTEXT definition. Set wxUSE_GRAPHICS_CONTEXT to 1 by default for MSVC 7.1+ and not 8+. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/setup0.h | 6 +++--- include/wx/msw/setup0.h | 6 +++--- include/wx/msw/wince/setup.h | 6 +++--- include/wx/os2/setup0.h | 6 +++--- include/wx/osx/setup0.h | 6 +++--- include/wx/palmos/setup0.h | 6 +++--- include/wx/setup_inc.h | 6 +++--- include/wx/univ/setup0.h | 6 +++--- setup.h.in | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 00db8cc364..c035b658fa 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -671,9 +671,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 326ca90733..924ef6f98e 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -671,9 +671,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 94e1cc63eb..880ac1c5cf 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -671,9 +671,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 9629934fe3..0e38cfa189 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -671,9 +671,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 709bc320b6..97f4709ce6 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -672,9 +672,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 8b67622a11..71f12caea4 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -671,9 +671,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 59ee2bec16..147f226c2e 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -667,9 +667,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 8bb1f531c7..d42ad35528 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -670,9 +670,9 @@ // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined #ifdef _MSC_VER -# if _MSC_VER >= 1400 - // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext - // support for it +# if _MSC_VER >= 1310 + // MSVC7.1+ comes with new enough Platform SDK, enable + // wxGraphicsContext support for it # define wxUSE_GRAPHICS_CONTEXT 1 # else // MSVC 6 didn't include GDI+ headers so disable by default, enable it diff --git a/setup.h.in b/setup.h.in index c97a5cbfe3..16aa2ae372 100644 --- a/setup.h.in +++ b/setup.h.in @@ -325,7 +325,7 @@ #ifdef _MSC_VER -# if _MSC_VER >= 1400 +# if _MSC_VER >= 1310 #define wxUSE_GRAPHICS_CONTEXT 0 -- 2.47.2