removed unneeded makefiles

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 49cb50fb98f969aa2e5657732aff48ff9912f147..19d2d2800c93c77a0ea20942e8e38e85b55dca0b 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "prntdlgg.h"
 #endif
 
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -252,6 +252,11 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     TransferDataFromWindow();
 
+    // An empty 'to' field signals printing just the
+    // 'from' page.
+    if (m_printDialogData.GetToPage() < 1)
+        m_printDialogData.SetToPage(m_printDialogData.GetFromPage());
+
     // There are some interactions between the global setup data
     // and the standard print dialog. The global printing 'mode'
     // is determined by whether the user checks Print to file
@@ -311,12 +316,12 @@ bool wxGenericPrintDialog::TransferDataToWindow()
           {
              m_fromText->Enable(TRUE);
              m_toText->Enable(TRUE);
-             m_fromText->SetValue(
-                 wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
-             m_toText->SetValue(
-                wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
+             if (m_printDialogData.GetFromPage() > 0)
+                m_fromText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
+             if (m_printDialogData.GetToPage() > 0)
+                m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
              if(m_rangeRadioBox)
-                if (m_printDialogData.GetAllPages())
+                if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);