Use Cairo for wxGraphicsContext in wxX11.
Check for Cairo in configure for wxX11 too. Fix compilation of wxCairoContext for non-{GTK,MSW} platforms. Also make wxUSE_CAIRO a "normal" option, i.e. add it to all wx/setup.h files instead of defining it as 1 unconditionally for wxGTK and 0 for everything else. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -439,17 +439,13 @@
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_BUTTON) */
|
||||
|
||||
/*
|
||||
This one is special, it's only used under wxGTK currently so don't require
|
||||
pre-defining it.
|
||||
*/
|
||||
#ifndef wxUSE_CAIRO
|
||||
# ifdef __WXGTK210__
|
||||
# define wxUSE_CAIRO 1
|
||||
# else
|
||||
# define wxUSE_CAIRO 0
|
||||
# endif
|
||||
#endif
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_BUTTON must be defined, please read comment near the top of this file."
|
||||
# else
|
||||
# define wxUSE_CAIRO 0
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_CAIRO) */
|
||||
|
||||
#ifndef wxUSE_CALENDARCTRL
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
|
@@ -689,6 +689,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -689,6 +689,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -689,6 +689,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -689,6 +689,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -690,6 +690,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -689,6 +689,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -685,6 +685,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -688,6 +688,19 @@
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable wxGraphicsContext implementation using Cairo library.
|
||||
//
|
||||
// This is not needed under Windows and detected automatically by configure
|
||||
// under other systems, however you may set this to 1 manually if you installed
|
||||
// Cairo under Windows yourself and prefer to use it instead the native GDI+
|
||||
// implementation.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0
|
||||
#define wxUSE_CAIRO 0
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user