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.
Closes #16294.
(this is a backport of 896e148da5
from master)
This commit is contained in:
committed by
Vadim Zeitlin
parent
2eb5cb50bb
commit
acec4b363b
@@ -636,6 +636,7 @@ wxOSX:
|
||||
- Fix length of text in wxTextDataObject.
|
||||
- Fix using wxHTTP and wxFTP from worker thread.
|
||||
- Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).
|
||||
- Fix printing all pages non-interactively (John Roberts).
|
||||
- Fix custom paper support (tijsv).
|
||||
- Return false from wxSound::Create()/IsOk() if the file doesn't exist.
|
||||
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user