Compilation fixes for Cairo-based wxGraphicsContext code under MSW.

Include MSW-specific headers under MSW to fix various compilation problems
under MinGW.

Closes #14194.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 871e320b0579bd6666395fdf66d6c2d3dce767cb..46d649c9f189f406d84c0cc6c49777056ec4fa3e 100644 (file)
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -25,6 +25,10 @@
 
 #if wxUSE_CAIRO
 
 
 #if wxUSE_CAIRO
 

+#ifdef __WXMSW__
+#include "wx/msw/wrapwin.h"
+#endif
+

 #ifdef __WXMAC__
 #include "wx/osx/private.h"
 #include <cairo-quartz.h>
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
 #include <cairo-quartz.h>

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 76efcf4b2a5dd6af77dc972a6df906646dcfd6f0..ec4830837f729f51c7001688fe4c544f3143ab6b 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -81,6 +81,9 @@ using namespace std;
 
 #ifdef __WXMSW__
 #include <cairo-win32.h>
 
 #ifdef __WXMSW__
 #include <cairo-win32.h>

+// We must do this as cairo-win32.h includes windows.h which pollutes the
+// global name space with macros.
+#include "wx/msw/winundef.h"

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__