simplify code so it always returns the same object

[wxWidgets.git] / src / common / cairo.cpp

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 46d649c9f189f406d84c0cc6c49777056ec4fa3e..572b0bb840f3418453f3241e79aae22746437ea7 100644 (file)
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -16,15 +16,15 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CAIRO
+
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
 #define cairo_public 
 
-#include "wx/cairo.h"
+#include <cairo.h>
 #include "wx/dynlib.h"
 
-#if wxUSE_CAIRO
-
 #ifdef __WXMSW__
 #include "wx/msw/wrapwin.h"
 #endif
@@ -379,18 +379,13 @@ bool wxCairo::IsOk()
 // implementation of the functions themselves
 // ============================================================================
 
-extern "C"
-{
-
 bool wxCairoInit()
 {
     return wxCairo::Initialize();
 }
 
-void wxCairoCleanUp()
+extern "C"
 {
-    wxCairo::CleanUp();
-}
 
 #define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret)                \
     rettype name params                                                               \