From 9a67941f0b2e707827b76a83bd619b24ef43f1ea Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 27 Nov 2009 21:36:03 +0000
Subject: [PATCH] Compilation fix for wxUSE_CAIRO==0 after last commit.

Include wx/graphics.h when wxUSE_CAIRO==0 but wxUSE_GRAPHICS_CONTEXT==1 (as in
e.g. MSW builds).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/graphicc.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index deb1b8b5e8..0cc09b6751 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -15,9 +15,12 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO
+#if wxUSE_GRAPHICS_CONTEXT
 
 #include "wx/graphics.h"
+
+#if wxUSE_CAIRO
+
 #include "wx/cairo.h"
 
 #ifndef WX_PRECOMP
@@ -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
-- 
2.45.2