X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ced3df773028534651ef358ae692affdbf3f9aaf..737e53350cffa493e72691fd965ebd60d5349bf2:/include/wx/cairo.h diff --git a/include/wx/cairo.h b/include/wx/cairo.h index 2135ea932f..8dd9e7556d 100644 --- a/include/wx/cairo.h +++ b/include/wx/cairo.h @@ -11,9 +11,13 @@ #ifndef _WX_CAIRO_H_BASE_ #define _WX_CAIRO_H_BASE_ - // for now GTK+ only -#ifdef __WXGTK210__ - #define wxUSE_CAIRO 1 +// for now GTK+ only +#ifndef wxUSE_CAIRO + #ifdef __WXGTK210__ + #define wxUSE_CAIRO 1 + #else + #define wxUSE_CAIRO 0 + #endif #endif #if wxUSE_CAIRO @@ -39,13 +43,13 @@ private: wxCairoLibrary(); ~wxCairoLibrary(); - + bool IsOk(); bool InitializeMethods(); wxDynamicLibrary m_libCairo; wxDynamicLibrary m_libPangoCairo; - + // true if we successfully loaded the libraries and can use them // // note that this field must have this name as it's used by wxDL_XXX macros @@ -98,6 +102,8 @@ public: (cairo_pattern_t *pattern, cairo_filter_t filter), (pattern, filter) ) wxDL_VOIDMETHOD_DEFINE( cairo_rectangle, (cairo_t *cr, double x, double y, double width, double height), (cr, x, y, width, height) ) + wxDL_METHOD_DEFINE( cairo_t*, cairo_reference, + (cairo_t *cr), (cr), NULL ) wxDL_VOIDMETHOD_DEFINE( cairo_reset_clip, (cairo_t *cr), (cr) ) wxDL_VOIDMETHOD_DEFINE( cairo_restore, @@ -140,7 +146,7 @@ public: wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_layout, (cairo_t *cr, PangoLayout *layout), (cr, layout) ) - DECLARE_NO_COPY_CLASS(wxCairoLibrary) + wxDECLARE_NO_COPY_CLASS(wxCairoLibrary); }; #endif // wxUSE_CAIRO