Implement SelectAll for OSX WebKit.

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

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index 8dd9e7556d1a05a5257127796a217603a2390c0e..88d570586bdb05ecdc0c8acdc394f2127ba6449b 100644 (file)
--- a/include/wx/cairo.h
+++ b/include/wx/cairo.h
@@ -3,7 +3,7 @@
 // Purpose:     Cairo library
 // Author:      Anthony Bretaudeau
 // Created:     2007-08-25
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Anthony Bretaudeau
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -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"


@@ -141,11 +132,12 @@ public:
     wxDL_VOIDMETHOD_DEFINE( cairo_translate,
         (cairo_t *cr, double tx, double ty), (cr, tx, ty) )
 
     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) )
     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) )

-
+#endif

     wxDECLARE_NO_COPY_CLASS(wxCairoLibrary);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxCairoLibrary);
 };