Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / msw / dcprint.cpp

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 8105eec4413e8a4ed55a9ed49d04b0443554db28..1fabf5e6df8690aeb30721b063ee5c9c0575acda 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -32,6 +32,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
+    #include "wx/dcmemory.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -46,9 +47,16 @@
     #include <print.h>
 #endif
 
+// mingw32 defines GDI_ERROR incorrectly
+#ifdef __GNUWIN32__
+    #undef GDI_ERROR
+    #define GDI_ERROR ((int)-1)
+#endif
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
+
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 // ============================================================================