Enable wxGraphicsContext and related classes by default if supported.

For MSW, check for gdiplus.h availability when using configure but only
support it for MSVC 7+ otherwise. For the other platforms, always support it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-24 00:01:15 +00:00
parent 9302396589
commit a12bd55b0d
13 changed files with 301 additions and 258 deletions

View File

@@ -655,16 +655,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -239,6 +239,15 @@
Compiler-specific checks.
*/
// Only MSVC 7+ has gdiplus.h, add exceptions for other compilers here if they
// can support it too (but notice that Borland currently dies in
// src/msw/gdiplus.cpp with "macro expansion too long" error even if the header
// is available)
#if !wxCHECK_VISUALC_VERSION(7)
#undef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
// Borland
#ifdef __BORLANDC__
@@ -254,10 +263,6 @@
# define wxUSE_DEBUG_NEW_ALWAYS 0
#endif
/* compiling src/msw/gdiplus.cpp results in "macro expansion too long" error */
#undef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif /* __BORLANDC__ */
/* DMC++ doesn't have definitions for date picker control, so use generic control

View File

@@ -655,28 +655,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
// Enable the new wxCairoContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that you will need to link with Cairo for this to work.
//
// Default is 0
//
// Recommended setting: 1
#ifndef wxUSE_CAIRO
#define wxUSE_CAIRO 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -655,16 +655,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -655,16 +655,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -656,16 +656,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -655,16 +655,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -651,16 +651,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls

View File

@@ -654,16 +654,17 @@
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
//
// Please note that on Windows you will need to link with gdiplus.lib (use
// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
// application if you want it to be runnable on pre-XP systems.
// Please note that on Windows gdiplus.dll is loaded dynamically which means
// that nothing special needs to be done as long as you don't use
// wxGraphicsContext at all or only use it on XP and later systems but you
// still do need to distribute it yourself for an application using
// wxGraphicsContext to be runnable on pre-XP systems.
//
// Default is 0
// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
// Windows is known to).
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
#define wxUSE_GRAPHICS_CONTEXT 1
// ----------------------------------------------------------------------------
// Individual GUI controls