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
This commit is contained in:
@@ -671,9 +671,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -671,9 +671,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -671,9 +671,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -671,9 +671,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -672,9 +672,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -671,9 +671,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -667,9 +667,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -670,9 +670,9 @@
|
|||||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
// 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
|
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
// MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
|
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||||
// support for it
|
// wxGraphicsContext support for it
|
||||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||||
# else
|
# else
|
||||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||||
|
@@ -325,7 +325,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER >= 1400
|
# if _MSC_VER >= 1310
|
||||||
|
|
||||||
|
|
||||||
#define wxUSE_GRAPHICS_CONTEXT 0
|
#define wxUSE_GRAPHICS_CONTEXT 0
|
||||||
|
Reference in New Issue
Block a user