add support for alpha in color dialog on OSX, see #14127

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 9018f7de7031374093ceeb7ce31959bd100d4023..0c8a2ed6521397984245a0c38f0d57a7317d5c5f 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -167,7 +167,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 
-    wxWindow *win = CreateAbortWindow(parent, printout);
+    wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);
     wxYield();
 
     ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
@@ -196,10 +196,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         maxPageNum = m_printDialogData.GetToPage();
     }
 
-    int copyCount;
-    for ( copyCount = 1;
-          copyCount <= m_printDialogData.GetNoCopies();
-          copyCount++ )
+    const int maxCopyCount = m_printDialogData.GetNoCopies();
+    for ( int copyCount = 1; copyCount <= maxCopyCount; copyCount++ )
     {
         if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
         {
@@ -219,6 +217,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
               pn <= maxPageNum && printout->HasPage(pn);
               pn++ )
         {
+            win->SetProgress(pn - minPageNum + 1,
+                             maxPageNum - minPageNum + 1,
+                             copyCount, maxCopyCount);
+
             if ( sm_abortIt )
             {
                 sm_lastError = wxPRINTER_CANCELLED;