wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index eecef2f52664304fd8343fced3fb8a170571760c..56c73814fa28cd69caa481051ff9b34d6e4f1e79 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -177,9 +177,6 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") );
     flex->Add( m_printToFileCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     
-    if (factory->HasOwnPrintToFile())
-        m_printToFileCheckBox->Enable( false );
-
     m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );
     flex->Add( m_setupButton, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
     
@@ -304,7 +301,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
     }
-
+    
     EndModal(wxID_OK);
 }
 
@@ -400,10 +397,16 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
         }
         if(m_rangeRadioBox)
         {
-           if (m_rangeRadioBox->GetSelection() == 0)
-              m_printDialogData.SetAllPages(true);
-           else
-              m_printDialogData.SetAllPages(false);
+            if (m_rangeRadioBox->GetSelection() == 0)
+            {
+                m_printDialogData.SetAllPages(true);
+                
+                // This means all pages, more or less
+                m_printDialogData.SetFromPage(1);
+                m_printDialogData.SetToPage(32000);
+            }
+            else
+                m_printDialogData.SetAllPages(false);
         }
     }
     else
@@ -421,11 +424,6 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
     return true;
 }
 
-/*
-TODO: collate and noCopies should be duplicated across dialog data and print data objects
-(slightly different semantics on Windows but let's ignore this for a bit).
-*/
-
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {
     return new wxPostScriptDC(GetPrintDialogData().GetPrintData());