X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc2bb342ec223d558682385992f3715e6f092672..be19c556083cc197be55acbd05db76ec6dc2e0c4:/include/wx/cairo.h diff --git a/include/wx/cairo.h b/include/wx/cairo.h index acb961c83f..60e06534a0 100644 --- a/include/wx/cairo.h +++ b/include/wx/cairo.h @@ -3,7 +3,7 @@ // Purpose: Cairo library // Author: Anthony Bretaudeau // Created: 2007-08-25 -// RCS-ID: $Id: cairo.h 47254 2007-08-25 10:09:52Z VS $ +// RCS-ID: $Id$ // Copyright: (c) Anthony Bretaudeau // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,15 +11,6 @@ #ifndef _WX_CAIRO_H_BASE_ #define _WX_CAIRO_H_BASE_ -// for now GTK+ only -#ifndef wxUSE_CAIRO - #ifdef __WXGTK210__ - #define wxUSE_CAIRO 1 - #else - #define wxUSE_CAIRO 0 - #endif -#endif - #if wxUSE_CAIRO #include "wx/dynlib.h" @@ -43,13 +34,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 @@ -146,7 +137,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