Use the size value passed to the ctor to set the window's minimum size.

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 49cb50fb98f969aa2e5657732aff48ff9912f147..e41ee6da364648fe9b59c2115e3c4ac65cf2d0ac 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "prntdlgg.h"
 #endif
 
     #pragma implementation "prntdlgg.h"
 #endif
 


@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
     #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"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -252,6 +252,11 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     TransferDataFromWindow();
 
 {
     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
     // 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->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_rangeRadioBox)

-                if (m_printDialogData.GetAllPages())
+                if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)

                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);
                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);


@@ -700,21 +705,16 @@ wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
 {
 }
 
 {
 }
 

-static inline wxString IntToString( long value )
-{
-    return wxString::Format(wxT("%ld"), value);
-}
-

 bool wxGenericPageSetupDialog::TransferDataToWindow()
 {
     if (m_marginLeftText)
 bool wxGenericPageSetupDialog::TransferDataToWindow()
 {
     if (m_marginLeftText)

-        m_marginLeftText->SetValue(IntToString(m_pageData.GetMarginTopLeft().x));
+        m_marginLeftText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginTopLeft().x));

     if (m_marginTopText)
     if (m_marginTopText)

-        m_marginTopText->SetValue(IntToString(m_pageData.GetMarginTopLeft().y));
+        m_marginTopText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginTopLeft().y));

     if (m_marginRightText)
     if (m_marginRightText)

-        m_marginRightText->SetValue(IntToString(m_pageData.GetMarginBottomRight().x));
+        m_marginRightText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().x));

     if (m_marginBottomText)
     if (m_marginBottomText)

-        m_marginBottomText->SetValue(IntToString(m_pageData.GetMarginBottomRight().y));
+        m_marginBottomText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().y));

 
     if (m_orientationRadioBox)
     {
 
     if (m_orientationRadioBox)
     {