X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0e69d720d8b15f788fe0998806f18c46f7d5d8b..d6b17e1aa398f19b9f1b7024eb3923da01430aff:/src/generic/graphicc.cpp

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 1634379aee..0cc09b6751 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -15,10 +15,13 @@
     #pragma hdrstop
 #endif
 
-#include "wx/cairo.h"
+#if wxUSE_GRAPHICS_CONTEXT
+
 #include "wx/graphics.h"
 
-#if wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO
+#if wxUSE_CAIRO
+
+#include "wx/cairo.h"
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
@@ -1799,10 +1802,10 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
 {
-#if __WXMSW__
+#ifdef __WXMSW__
     return new wxCairoContext(this,(HDC)context);
 #endif
-#if __WXGTK__
+#ifdef __WXGTK__
     return new wxCairoContext(this,(cairo_t*)context);
 #endif
 }
@@ -1949,9 +1952,8 @@ wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& WXUNUSED(bitmap),
     return wxNullGraphicsBitmap;
 }
 
-#endif  // wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO
+#endif  // wxUSE_CAIRO
 
-#if wxUSE_GRAPHICS_CONTEXT
 wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
 {
 #if wxUSE_CAIRO
@@ -1960,4 +1962,5 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
     return NULL;
 #endif
 }
-#endif
+
+#endif // wxUSE_GRAPHICS_CONTEXT