Block new frames being created in wxWebViewIE, bringing it into line with the other...

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

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index a6041f2418da8bc317cfa6f6775c4fd04016566c..60e06534a0000010c391963dafa6000afbbde630 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"


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