X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3df485fd5b5474a059fa1467e05cf38a92928a86..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/cairo.h?ds=sidebyside

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index 7133656190..88d570586b 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
@@ -102,6 +93,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,
@@ -139,12 +132,13 @@ public:
     wxDL_VOIDMETHOD_DEFINE( cairo_translate,
         (cairo_t *cr, double tx, double ty), (cr, tx, ty) )
 
+#if wxUSE_PANGO
     wxDL_VOIDMETHOD_DEFINE( pango_cairo_update_layout,
         (cairo_t *cr, PangoLayout *layout), (cr, layout) )
     wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_layout,
         (cairo_t *cr, PangoLayout *layout), (cr, layout) )
-
-    DECLARE_NO_COPY_CLASS(wxCairoLibrary)
+#endif
+    wxDECLARE_NO_COPY_CLASS(wxCairoLibrary);
 };
 
 #endif // wxUSE_CAIRO