Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't define wxUSE_GRAPHICS_GDIPLUS as 1 by default.

Browse Source 
Define it and wxUSE_GRAPHICS_DIRECT2D, when it's supposed to be enabled, as
wxUSE_GRAPHICS_CONTEXT instead. This ensures they are set to 0 if the use of
wxGraphicsContext is entirely disabled, as is the case when using MinGW under
MSW by default for example.

Closes #16558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-15 17:27:50 +00:00
parent 36367a650a
commit cde3018236
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/setup0.h
View File

@@ -1479,7 +1479,7 @@
// //
// Recommended setting: 1 if you need to support XP, as Direct2D is not // Recommended setting: 1 if you need to support XP, as Direct2D is not
// available there. // available there.
#define wxUSE_GRAPHICS_GDIPLUS 1 #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
// Enable support for Direct2D-based implementation of wxGraphicsContext. // Enable support for Direct2D-based implementation of wxGraphicsContext.
// //
@@ -1491,7 +1491,7 @@
// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
// systems will fall back on using GDI+). // systems will fall back on using GDI+).
#if defined(_MSC_VER) && _MSC_VER >= 1600 #if defined(_MSC_VER) && _MSC_VER >= 1600
#define wxUSE_GRAPHICS_DIRECT2D 1 #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
#else #else
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D 0
#endif #endif

4
include/wx/msw/setup0.h
View File

@@ -1479,7 +1479,7 @@
// //
// Recommended setting: 1 if you need to support XP, as Direct2D is not // Recommended setting: 1 if you need to support XP, as Direct2D is not
// available there. // available there.
#define wxUSE_GRAPHICS_GDIPLUS 1 #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
// Enable support for Direct2D-based implementation of wxGraphicsContext. // Enable support for Direct2D-based implementation of wxGraphicsContext.
// //
@@ -1491,7 +1491,7 @@
// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
// systems will fall back on using GDI+). // systems will fall back on using GDI+).
#if defined(_MSC_VER) && _MSC_VER >= 1600 #if defined(_MSC_VER) && _MSC_VER >= 1600
#define wxUSE_GRAPHICS_DIRECT2D 1 #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
#else #else
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D 0
#endif #endif

4
include/wx/msw/setup_inc.h
View File

@@ -19,7 +19,7 @@
// //
// Recommended setting: 1 if you need to support XP, as Direct2D is not // Recommended setting: 1 if you need to support XP, as Direct2D is not
// available there. // available there.
#define wxUSE_GRAPHICS_GDIPLUS 1 #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
// Enable support for Direct2D-based implementation of wxGraphicsContext. // Enable support for Direct2D-based implementation of wxGraphicsContext.
// //
@@ -31,7 +31,7 @@
// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
// systems will fall back on using GDI+). // systems will fall back on using GDI+).
#if defined(_MSC_VER) && _MSC_VER >= 1600 #if defined(_MSC_VER) && _MSC_VER >= 1600
#define wxUSE_GRAPHICS_DIRECT2D 1 #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
#else #else
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D 0
#endif #endif

4
setup.h.in
View File

@@ -635,10 +635,10 @@
/* --- start MSW options --- */ /* --- start MSW options --- */
#define wxUSE_GRAPHICS_GDIPLUS 0 #define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
#if defined(_MSC_VER) && _MSC_VER >= 1600 #if defined(_MSC_VER) && _MSC_VER >= 1600
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
#else #else
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D 0
#endif #endif