Set up pages range in the wxMSW print dialog correctly.

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 9018f7de7031374093ceeb7ce31959bd100d4023..dd8c25b4204c349e8416a4710aa5f74f8831ff2e 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -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;