Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

[wxWidgets.git] / include / wx / cairo.h

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index 7133656190a8aba2d3975ff5cd647d191c5bed03..0d53cca929e16bbd956941cf2d454648b184c57c 100644 (file)
--- a/include/wx/cairo.h
+++ b/include/wx/cairo.h
@@ -11,15 +11,6 @@
 #ifndef _WX_CAIRO_H_BASE_
 #define _WX_CAIRO_H_BASE_
 
 #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"
 #if wxUSE_CAIRO
 
 #include "wx/dynlib.h"


@@ -43,13 +34,13 @@ private:
 
     wxCairoLibrary();
     ~wxCairoLibrary();
 
     wxCairoLibrary();
     ~wxCairoLibrary();

-    
+

     bool IsOk();
     bool InitializeMethods();
 
     wxDynamicLibrary m_libCairo;
     wxDynamicLibrary m_libPangoCairo;
     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
     // 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) )
         (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,
     wxDL_VOIDMETHOD_DEFINE( cairo_reset_clip,
         (cairo_t *cr), (cr) )
     wxDL_VOIDMETHOD_DEFINE( cairo_restore,


@@ -144,7 +137,7 @@ public:
     wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_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)
+    wxDECLARE_NO_COPY_CLASS(wxCairoLibrary);

 };
 
 #endif // wxUSE_CAIRO
 };
 
 #endif // wxUSE_CAIRO