From 896e148da5281ba31b158895faa0a826b0beb426 Mon Sep 17 00:00:00 2001 From: John Roberts Date: Sat, 18 Jul 2015 00:59:24 +0200 Subject: [PATCH] Fix printing all pages without dialog prompt in wxOSX. Do set from and to pages if we're not asking the user to choose them, otherwise nothing is printed at all. See #16294. --- src/osx/core/printmac.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp index d837da21a2..21b6d45a4c 100644 --- a/src/osx/core/printmac.cpp +++ b/src/osx/core/printmac.cpp @@ -637,10 +637,21 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) } // Only set min and max, because from and to will be - // set by the user + // set by the user if prompted for the print dialog above m_printDialogData.SetMinPage(minPage); m_printDialogData.SetMaxPage(maxPage); + // Set from and to pages if bypassing the print dialog + if ( !prompt ) + { + m_printDialogData.SetFromPage(fromPage); + + if( m_printDialogData.GetAllPages() ) + m_printDialogData.SetToPage(maxPage); + else + m_printDialogData.SetToPage(toPage); + } + printout->OnBeginPrinting(); bool keepGoing = true;