AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set up pages range in the wxMSW print dialog correctly.

Browse Source 
Propagate the information about the number of pages from the printout to the
print dialog in wxWindowsPrinter::Print().

Closes #12819.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-01-03 18:44:36 +00:00
parent ca8b470a41
commit 41514cc474
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/printwin.cpp
View File

@ -91,10 +91,16 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
return false;
}
if (m_printDialogData.GetMinPage() < 1)
m_printDialogData.SetMinPage(1);
if (m_printDialogData.GetMaxPage() < 1)
m_printDialogData.SetMaxPage(9999);
// Get some parameters from the printout, if defined
int fromPage, toPage;
int minPage, maxPage;
printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
m_printDialogData.SetFromPage(fromPage);
m_printDialogData.SetToPage(toPage);
m_printDialogData.SetMinPage(minPage);
m_printDialogData.SetMaxPage(maxPage);
m_printDialogData.SetAllPages((fromPage == minPage) && (toPage == maxPage));
// Create a suitable device context
wxPrinterDC *dc wxDUMMY_INITIALIZE(NULL);
@ -151,11 +157,6 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
printout->OnPreparePrinting();
// Get some parameters from the printout, if defined
int fromPage, toPage;
int minPage, maxPage;
printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
if (maxPage == 0)
{
sm_lastError = wxPRINTER_ERROR;