X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/475f6e7ae83684093380609dc1b167b21e2c1a87..695237bccd652c60deba347117ba5ab32067880c:/src/msw/dcprint.cpp diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index b49d678fb8..c39d15dc3f 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -47,9 +47,16 @@ #include #endif +// mingw32 defines GDI_ERROR incorrectly +#ifdef __GNUWIN32__ + #undef GDI_ERROR + #define GDI_ERROR ((int)-1) +#endif + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- + IMPLEMENT_CLASS(wxPrinterDC, wxDC) // ============================================================================ @@ -408,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)