X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a71d815bbe669ebb9bdb9409926a272c37a5a9aa..3a3dde0d44c43bc70a1e9791381ada04b4953a5d:/src/msw/dcprint.cpp?ds=sidebyside

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 3fbe8b2085..4b514b9e32 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -24,27 +24,28 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
+    #include "wx/math.h"
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB
-#include "wx/msw/dib.h"
+    #include "wx/msw/dib.h"
 #endif
 
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
-#include "wx/math.h"
 
-#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif
@@ -55,6 +56,12 @@
     #define GDI_ERROR ((int)-1)
 #endif
 
+#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
+    #define wxUSE_PS_PRINTING 1
+#else
+    #define wxUSE_PS_PRINTING 0
+#endif
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -186,15 +193,13 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     if (!m_hDC)
         return false;
 
-    int ret = ::StartDoc(GetHdc(), &docinfo);
-
-    if (ret <= 0)
+    if ( ::StartDoc(GetHdc(), &docinfo) <= 0 )
     {
-        DWORD lastError = GetLastError();
-        wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError);
+        wxLogLastError(wxT("StartDoc"));
+        return false;
     }
 
-    return (ret > 0);
+    return true;
 }
 
 void wxPrinterDC::EndDoc()
@@ -214,6 +219,21 @@ void wxPrinterDC::EndPage()
         ::EndPage((HDC) m_hDC);
 }
 
+
+wxRect wxPrinterDC::GetPaperRect()
+
+{
+    if (!Ok()) return wxRect(0, 0, 0, 0);
+    int w = ::GetDeviceCaps((HDC) m_hDC, PHYSICALWIDTH);
+    int h = ::GetDeviceCaps((HDC) m_hDC, PHYSICALHEIGHT);
+    int x = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETX);
+    int y = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETY);
+    return wxRect(x, y, w, h);
+}
+
+
+#if !wxUSE_PS_PRINTING
+
 // Returns default device and port names
 static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 {
@@ -272,66 +292,46 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
     return ( !deviceName.empty() );
 }
 
+#endif // !wxUSE_PS_PRINTING
+
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {
-#if defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
-
-#if 0
-    wxPostScriptPrintNativeData *data =
-        (wxPostScriptPrintNativeData *) printDataConst.GetNativeData();
-    // FIXME: how further ???
-#else
+#if wxUSE_PS_PRINTING
+    // TODO
+    wxUnusedVar(printDataConst);
     return 0;
-#endif
-
-#else // Postscript vs. native Windows
-
+#else // native Windows printing
     wxWindowsPrintNativeData *data =
         (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
 
     data->TransferFrom( printDataConst );
 
-    wxChar* driverName = (wxChar*) NULL;
-
-    wxString devNameStr = printDataConst.GetPrinterName();
-    wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32
-
-    const wxChar* deviceName;
-    if ( !devNameStr )
-        deviceName = (wxChar*) NULL;
-    else
-        deviceName = devNameStr.c_str();
-
-    LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
-
-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
-
-    if ( hDevMode )
-        lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
-
-    if ( !devNameStr )
+    wxString deviceName = printDataConst.GetPrinterName();
+    if ( deviceName.empty() )
     {
         // Retrieve the default device name
         wxString portName;
-        if ( !wxGetDefaultDeviceName(devNameStr, portName) )
+        if ( !wxGetDefaultDeviceName(deviceName, portName) )
         {
             return 0; // Could not get default device name
         }
-        deviceName = devNameStr.c_str();
     }
 
-#ifdef __WIN32__
-    HDC hDC = CreateDC(driverName, deviceName, portName, (DEVMODE *) lpDevMode);
-#else
-    HDC hDC = CreateDC(driverName, deviceName, portName, (LPSTR) lpDevMode);
-#endif
 
-    if (hDevMode && lpDevMode)
-        GlobalUnlock(hDevMode);
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
+
+    DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL;
+
+    HDC hDC = ::CreateDC(NULL, deviceName, NULL, lpDevMode);
+    if ( !hDC )
+        wxLogLastError(_T("CreateDC(printer)"));
+
+    if ( lpDevMode )
+        ::GlobalUnlock(hDevMode);
 
     return (WXHDC) hDC;
-#endif
+#endif // PostScript/Windows printing
 }
 
 // ----------------------------------------------------------------------------
@@ -397,7 +397,8 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
     {
         // no support for StretchDIBits() or an error occurred if we got here
         wxMemoryDC memDC;
-        memDC.SelectObject(bmp);
+
+        memDC.SelectObjectAsSource(bmp);
 
         Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);