ProgressDialog now handles multiple copies and shows total number of pages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index cc301b7aae1c3e4e7260a780bfc4c52b1e91c843..599715179f94b0089afb94407ec96649f3e8c743 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -167,11 +167,15 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     // Create an abort window
     wxBeginBusyCursor();
 
     // Create an abort window
     wxBeginBusyCursor();
 

+    int
+       pagesPerCopy = maxPage-minPage+1,
+       totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(),
+       printedPages = 0;

     // Open the progress bar dialog
     wxProgressDialog *progressDialog = new wxProgressDialog (
        printout->GetTitle(),
        _("Printing..."),
     // Open the progress bar dialog
     wxProgressDialog *progressDialog = new wxProgressDialog (
        printout->GetTitle(),
        _("Printing..."),

-       maxPage-minPage+1,
+       totalPages,

        parent,
        /* disable parent only */ true,
        /* show abort button */ true);
        parent,
        /* disable parent only */ true,
        /* show abort button */ true);


@@ -204,8 +208,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
             else
             {
                wxString msg;
             else
             {
                wxString msg;

-               msg.Printf(_("Printing page %d..."), pn);
-               if(progressDialog->Update(pn-minPage, msg))
+               msg.Printf(_("Printing page %d..."), printedPages+1);
+               if(progressDialog->Update(printedPages++, msg))

                {
                   dc->StartPage();
                   printout->OnPrintPage(pn);
                {
                   dc->StartPage();
                   printout->OnPrintPage(pn);


@@ -214,15 +218,15 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
                else
                {
                   sm_abortIt = true;
                else
                {
                   sm_abortIt = true;

-                  keepGoing = false; //FIXME: do we need both?
+                  keepGoing = false;

                }
             }
         }
                }
             }
         }

-        delete progressDialog;

         printout->OnEndDocument();
     }
 
     printout->OnEndPrinting();
         printout->OnEndDocument();
     }
 
     printout->OnEndPrinting();

+    delete progressDialog;

 
     wxEndBusyCursor();
 
 
     wxEndBusyCursor();