Found bug that skrewed up display wrt horizontal

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 8105eec4413e8a4ed55a9ed49d04b0443554db28..c39d15dc3f33f3c7323c5f677a0d405a97ec8d07 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)
 
 // ============================================================================
@@ -407,6 +415,11 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 // wxPrinterDC bit blitting/bitmap drawing
 // ----------------------------------------------------------------------------
 
+// Win16 doesn't define GDI_ERROR.
+#ifndef GDI_ERROR
+#define GDI_ERROR -1
+#endif
+
 void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
                                wxCoord x, wxCoord y,
                                bool useMask)