X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/446659cac6be2946cc58ccc574fc8a4d1f7bad5a..88932ec82d048d006cdc81bd309f5e59aee799ac:/src/msw/printwin.cpp?ds=sidebyside

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 3648192fc8..0c8a2ed652 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -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;