X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c929ad91417a4ee797652d79300c0c23219a46fd..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/printwin.cpp

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 9018f7de70..0c8a2ed652 100644
--- 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;