Added wxVariant::Convert() implementations for wx(U)LongLong_t, so that wxVariant...

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

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index acb961c83f3d2022409aa45e986b7040b01277ec..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_
 
-// 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