| From b206fab883c3063f393908afac6e00591ca05f9d Mon Sep 17 00:00:00 2001 |
| From: Tim Stahlhut <stahta01@gmail.com> |
| Date: Fri, 31 May 2019 00:44:59 -0400 |
| Subject: Setup wxUSE_GRAPHICS_DIRECT2D |
| |
| --- |
| build/cmake/setup.h.in | 2 +- |
| include/wx/gtk/setup.h | 2 +- |
| include/wx/msw/setup.h | 2 +- |
| include/wx/msw/setup_inc.h | 2 +- |
| setup.h.in | 2 +- |
| 5 files changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in |
| index 2b5c6a29a1..244f695500 100644 |
| --- a/build/cmake/setup.h.in |
| +++ b/build/cmake/setup.h.in |
| @@ -668,7 +668,7 @@ |
| |
| #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT |
| |
| -#if defined(_MSC_VER) && _MSC_VER >= 1600 |
| +#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) ) |
| #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT |
| #else |
| #cmakedefine01 wxUSE_GRAPHICS_DIRECT2D |
| diff --git a/include/wx/gtk/setup.h b/include/wx/gtk/setup.h |
| index 8355fbf4b3..0358364736 100644 |
| --- a/include/wx/gtk/setup.h |
| +++ b/include/wx/gtk/setup.h |
| @@ -1580,7 +1580,7 @@ |
| // Recommended setting: 1 for faster and better quality graphics under Windows |
| // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier |
| // systems will fall back on using GDI+). |
| -#if defined(_MSC_VER) && _MSC_VER >= 1600 |
| +#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) ) |
| #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT |
| #else |
| #define wxUSE_GRAPHICS_DIRECT2D 0 |
| diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h |
| index 22ba9acf3b..46a3825b0c 100644 |
| --- a/include/wx/msw/setup.h |
| +++ b/include/wx/msw/setup.h |
| @@ -1580,7 +1580,7 @@ |
| // Recommended setting: 1 for faster and better quality graphics under Windows |
| // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier |
| // systems will fall back on using GDI+). |
| -#if defined(_MSC_VER) && _MSC_VER >= 1600 |
| +#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) ) |
| #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT |
| #else |
| #define wxUSE_GRAPHICS_DIRECT2D 0 |
| diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h |
| index c764432c9d..eca28b9486 100644 |
| --- a/include/wx/msw/setup_inc.h |
| +++ b/include/wx/msw/setup_inc.h |
| @@ -30,7 +30,7 @@ |
| // Recommended setting: 1 for faster and better quality graphics under Windows |
| // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier |
| // systems will fall back on using GDI+). |
| -#if defined(_MSC_VER) && _MSC_VER >= 1600 |
| +#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) ) |
| #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT |
| #else |
| #define wxUSE_GRAPHICS_DIRECT2D 0 |
| diff --git a/setup.h.in b/setup.h.in |
| index b2491c00df..ea2a32b1da 100644 |
| --- a/setup.h.in |
| +++ b/setup.h.in |
| @@ -668,7 +668,7 @@ |
| |
| #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT |
| |
| -#if defined(_MSC_VER) && _MSC_VER >= 1600 |
| +#if defined(_MSC_VER) && _MSC_VER >= 1600 || ( defined(__MINGW32__) && defined(__WXMSW__) ) |
| #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT |
| #else |
| #define wxUSE_GRAPHICS_DIRECT2D 0 |
| -- |