X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..b310cebd711a5a616502012b64cdc37d8f6ab9d8:/src/msw/printwin.cpp?ds=inline

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index f46993f88a..bc72876edd 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "printwin.h"
 #endif
 
@@ -30,6 +30,10 @@
 
 #include "wx/defs.h"
 
+// Don't use the Windows printer if we're in wxUniv mode and using
+// the PostScript architecture
+#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/msw/private.h"
@@ -85,57 +89,30 @@ wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
 
 wxWindowsPrinter::~wxWindowsPrinter()
 {
-    // avoids mingw warning about statement with no effect (FreeProcInstance
+    // avoids warning about statement with no effect (FreeProcInstance
     // doesn't do anything under Win32)
-#ifndef __GNUWIN32__
+#if !defined(__WIN32__) && !defined(__NT__)
     FreeProcInstance((FARPROC) m_lpAbortProc);
 #endif
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
-    sm_abortIt = FALSE;
+    sm_abortIt = false;
     sm_abortWindow = NULL;
 
     if (!printout)
-        return FALSE;
-
-    printout->SetIsPreview(FALSE);
-
-    // 4/9/99, JACS: this is a silly place to allow preparation, considering
-    // the DC and no parameters have been set in the printout object.
-    // Moved further down.
-    // printout->OnPreparePrinting();
-
-    // Get some parameters from the printout, if defined
-    int fromPage, toPage;
-    int minPage, maxPage;
-    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
-
-    if (maxPage == 0)
-        return FALSE;
-
-    m_printDialogData.SetMinPage(minPage);
-    m_printDialogData.SetMaxPage(maxPage);
-    if (fromPage != 0)
-        m_printDialogData.SetFromPage(fromPage);
-    if (toPage != 0)
-        m_printDialogData.SetToPage(toPage);
-
-    if (minPage != 0)
     {
-        m_printDialogData.EnablePageNumbers(TRUE);
-        if (m_printDialogData.GetFromPage() < m_printDialogData.GetMinPage())
-            m_printDialogData.SetFromPage(m_printDialogData.GetMinPage());
-        else if (m_printDialogData.GetFromPage() > m_printDialogData.GetMaxPage())
-            m_printDialogData.SetFromPage(m_printDialogData.GetMaxPage());
-        if (m_printDialogData.GetToPage() > m_printDialogData.GetMaxPage())
-            m_printDialogData.SetToPage(m_printDialogData.GetMaxPage());
-        else if (m_printDialogData.GetToPage() < m_printDialogData.GetMinPage())
-            m_printDialogData.SetToPage(m_printDialogData.GetMinPage());
+        sm_lastError = wxPRINTER_ERROR;
+        return false;
     }
-    else
-        m_printDialogData.EnablePageNumbers(FALSE);
+
+    printout->SetIsPreview(false);
+
+    if (m_printDialogData.GetMinPage() < 1)
+        m_printDialogData.SetMinPage(1);
+    if (m_printDialogData.GetMaxPage() < 1)
+        m_printDialogData.SetMaxPage(9999);
 
     // Create a suitable device context
     wxDC *dc = NULL;
@@ -143,11 +120,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     {
         dc = PrintDialog(parent);
         if (!dc)
-            return FALSE;
+            return false;
     }
     else
     {
-        //      dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());
         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }
 
@@ -155,7 +131,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
-        return FALSE;
+        return false;
     }
 
     int logPPIScreenX = 0;
@@ -173,7 +149,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
-        return FALSE;
+        sm_lastError = wxPRINTER_ERROR;
+        return false;
     }
 
     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
@@ -190,10 +167,26 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     printout->SetPageSizeMM((int)w, (int)h);
 
     // Create an abort window
-    wxBeginBusyCursor();
+    wxBusyCursor busyCursor;
 
     printout->OnPreparePrinting();
 
+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
+
+    if (maxPage == 0)
+    {
+        sm_lastError = wxPRINTER_ERROR;
+        return false;
+    }
+
+    // Only set min and max, because from and to have been
+    // set by the user
+    m_printDialogData.SetMinPage(minPage);
+    m_printDialogData.SetMaxPage(maxPage);
+
     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
 
@@ -218,38 +211,53 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     if (!win)
     {
-        wxEndBusyCursor();
         wxLogDebug(wxT("Could not create an abort dialog."));
+        sm_lastError = wxPRINTER_ERROR;
 
         delete dc;
     }
     sm_abortWindow = win;
-    sm_abortWindow->Show(TRUE);
+    sm_abortWindow->Show();
     wxSafeYield();
 
     printout->OnBeginPrinting();
 
+    sm_lastError = wxPRINTER_NO_ERROR;
+
+    int minPageNum = minPage, maxPageNum = maxPage;
+
+    if ( !m_printDialogData.GetAllPages() )
+    {
+        minPageNum = m_printDialogData.GetFromPage();
+        maxPageNum = m_printDialogData.GetToPage();
+    }
+
     int copyCount;
     for ( copyCount = 1;
           copyCount <= m_printDialogData.GetNoCopies();
           copyCount++ )
     {
-        if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+        if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
         {
-            wxEndBusyCursor();
             wxLogError(_("Could not start printing."));
+            sm_lastError = wxPRINTER_ERROR;
             break;
         }
         if (sm_abortIt)
+        {
+            sm_lastError = wxPRINTER_CANCELLED;
             break;
+        }
 
         int pn;
-        for ( pn = m_printDialogData.GetFromPage();
-              pn <= m_printDialogData.GetToPage() && printout->HasPage(pn);
+
+        for ( pn = minPageNum;
+              pn <= maxPageNum && printout->HasPage(pn);
               pn++ )
         {
             if ( sm_abortIt )
             {
+                sm_lastError = wxPRINTER_CANCELLED;
                 break;
             }
 
@@ -258,7 +266,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
             dc->EndPage();
 
             if ( !cont )
+            {
+                sm_lastError = wxPRINTER_CANCELLED;
                 break;
+            }
         }
 
         printout->OnEndDocument();
@@ -268,16 +279,14 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     if (sm_abortWindow)
     {
-        sm_abortWindow->Show(FALSE);
+        sm_abortWindow->Show(false);
         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }
 
-    wxEndBusyCursor();
-
     delete dc;
 
-    return TRUE;
+    return (sm_lastError == wxPRINTER_NO_ERROR);
 }
 
 wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
@@ -291,7 +300,13 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();
+        if (dc == NULL)
+            sm_lastError = wxPRINTER_ERROR;
+        else
+            sm_lastError = wxPRINTER_NO_ERROR;
     }
+    else
+        sm_lastError = wxPRINTER_CANCELLED;
 
     return dc;
 }
@@ -299,7 +314,7 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
 bool wxWindowsPrinter::Setup(wxWindow *parent)
 {
     wxPrintDialog dialog(parent, & m_printDialogData);
-    dialog.GetPrintDialogData().SetSetupDialog(TRUE);
+    dialog.GetPrintDialogData().SetSetupDialog(true);
 
     int ret = dialog.ShowModal();
 
@@ -338,7 +353,7 @@ wxWindowsPrintPreview::~wxWindowsPrintPreview()
 bool wxWindowsPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
-        return FALSE;
+        return false;
     wxWindowsPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
@@ -347,9 +362,7 @@ void wxWindowsPrintPreview::DetermineScaling()
 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
-    //    int screenHeight = ::GetDeviceCaps(dc, VERTSIZE);
-    int screenXRes = ::GetDeviceCaps(dc, HORZRES);
-    //    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
+    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
     m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
@@ -364,31 +377,32 @@ void wxWindowsPrintPreview::DetermineScaling()
     int printerXRes = 1500;
     int printerYRes = 2500;
 
-    if (printerDC.GetHDC())
+    dc = GetHdcOf(printerDC);
+    if ( dc )
     {
-        printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
-        printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
-        printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
-        printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
+        printerWidth = ::GetDeviceCaps(dc, HORZSIZE);
+        printerHeight = ::GetDeviceCaps(dc, VERTSIZE);
+        printerXRes = ::GetDeviceCaps(dc, HORZRES);
+        printerYRes = ::GetDeviceCaps(dc, VERTRES);
 
-        int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
-        int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
+        int logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
+        int logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
 
         m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
         m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
 
         if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
-            m_isOk = FALSE;
+            m_isOk = false;
     }
     else
-        m_isOk = FALSE;
+        m_isOk = false;
 
     m_pageWidth = printerXRes;
     m_pageHeight = printerYRes;
 
     // At 100%, the page should look about page-size on the screen.
     m_previewScale = (float)((float)screenWidth/(float)printerWidth);
-    m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes);
+    m_previewScale = m_previewScale * (float)((float)screenYRes/(float)printerYRes);
 }
 
 /****************************************************************************
@@ -419,3 +433,5 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
         return (!wxPrinterBase::sm_abortIt);
 }
 
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE