keyboard/focus handling improved a bit more:

[wxWidgets.git] / src / generic / printps.cpp

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index 599715179f94b0089afb94407ec96649f3e8c743..5cb8272a26cdaf93ecb255ae51abb6a2e08d5391 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -30,6 +30,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
@@ -168,7 +170,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     wxBeginBusyCursor();
 
     int
-       pagesPerCopy = maxPage-minPage+1,
+       pagesPerCopy = m_printDialogData.GetToPage()-m_printDialogData.GetFromPage()+1,
        totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(),
        printedPages = 0;
     // Open the progress bar dialog
@@ -176,9 +178,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
        printout->GetTitle(),
        _("Printing..."),
        totalPages,
-       parent,
-       /* disable parent only */ true,
-       /* show abort button */ true);
+       parent );
     
     printout->OnBeginPrinting();
 
@@ -347,3 +347,4 @@ void wxPostScriptPrintPreview::DetermineScaling()
     }
 }
 
+#endif