Committing in .

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 8105eec4413e8a4ed55a9ed49d04b0443554db28..e8ccc8bac868f674136cad7783bb00d0ad9f4ecd 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -32,8 +32,11 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"

+    #include "wx/dcmemory.h"

 #endif
 
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/msw/private.h"
 #include "wx/dcprint.h"
 #include "math.h"
 #include "wx/msw/private.h"
 #include "wx/dcprint.h"
 #include "math.h"


@@ -46,9 +49,16 @@
     #include <print.h>
 #endif
 
     #include <print.h>
 #endif
 

+// mingw32 defines GDI_ERROR incorrectly
+#ifdef __GNUWIN32__
+    #undef GDI_ERROR
+    #define GDI_ERROR ((int)-1)
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

+

 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 // ============================================================================
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 // ============================================================================


@@ -407,6 +417,11 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 // wxPrinterDC bit blitting/bitmap drawing
 // ----------------------------------------------------------------------------
 
 // 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)
 void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
                                wxCoord x, wxCoord y,
                                bool useMask)


@@ -443,7 +458,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
                                  bits, info,
                                  DIB_RGB_COLORS, SRCCOPY) == GDI_ERROR )
             {
                                  bits, info,
                                  DIB_RGB_COLORS, SRCCOPY) == GDI_ERROR )
             {

-                wxLogLastError("StretchDIBits");
+                wxLogLastError(wxT("StretchDIBits"));

             }
         }
 
             }
         }
 


@@ -525,7 +540,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
             if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0,
                               height, bits, info, DIB_RGB_COLORS) )
             {
             if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0,
                               height, bits, info, DIB_RGB_COLORS) )
             {

-                wxLogLastError("GetDIBits");
+                wxLogLastError(wxT("GetDIBits"));

 
                 success = FALSE;
             }
 
                 success = FALSE;
             }


@@ -541,7 +556,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                                           SRCCOPY) != GDI_ERROR;
                 if ( !success )
                 {
                                           SRCCOPY) != GDI_ERROR;
                 if ( !success )
                 {

-                    wxLogLastError("StretchDIBits");
+                    wxLogLastError(wxT("StretchDIBits"));

                 }
             }
 
                 }
             }
 


@@ -580,3 +595,6 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
     return success;
 }
 
     return success;
 }

+
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE