diff --git a/docs/changes.txt b/docs/changes.txt index 03eeb53fd3..f64bc4e691 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -697,6 +697,7 @@ wxMSW: - Return more native shell icons from wxArtProvider (Markus Juergens). - Fix filter checks in wxDir::FindFirst/Next() (Catalin Raceanu). - Add support for wxICON_AUTH_NEEDED to wxMessageDialog (Chris Spencer). +- Fix printing too many copies of the document in some cases (John Roberts). wxOSX/Cocoa: diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index 0c8a2ed652..62abb589f6 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -196,7 +196,14 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt maxPageNum = m_printDialogData.GetToPage(); } - const int maxCopyCount = m_printDialogData.GetNoCopies(); + // The dc we get from the PrintDialog will do multiple copies without help + // if the device supports it. Loop only if we have created a dc from our + // own m_printDialogData or the device does not support multiple copies. + // m_printDialogData.GetPrintData().GetNoCopies() is set from device + // devMode in printdlg.cpp/wxWindowsPrintDialog::ConvertFromNative() + const int maxCopyCount = !prompt || + !m_printDialogData.GetPrintData().GetNoCopies() + ? m_printDialogData.GetNoCopies() : 1; for ( int copyCount = 1; copyCount <= maxCopyCount; copyCount++ ) { if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )