Mention removal of wxHIDE_READONLY

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index e7a3330a8f851db633d0eb28ac74a5f6804d1fed..38938d2c43f6cc1fdd225c99eceacca030c62388 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"


@@ -107,7 +107,6 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                     : wxDialog(parent, -1, _("Print"),
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                     : wxDialog(parent, -1, _("Print"),
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |

-                               wxDIALOG_MODAL |

                                wxTAB_TRAVERSAL)
 {
     if ( data )
                                wxTAB_TRAVERSAL)
 {
     if ( data )


@@ -121,7 +120,6 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                     : wxDialog(parent, -1, _("Print"),
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                     : wxDialog(parent, -1, _("Print"),
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |

-                               wxDIALOG_MODAL |

                                wxTAB_TRAVERSAL)
 {
     if ( data )
                                wxTAB_TRAVERSAL)
 {
     if ( data )


@@ -133,7 +131,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 {
   //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
 void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 {
   //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),

-  //                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
+  //                     wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);

 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 


@@ -405,7 +403,7 @@ wxDC *wxGenericPrintDialog::GetPrintDC()
 // ----------------------------------------------------------------------------
 
 wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
 // ----------------------------------------------------------------------------
 
 wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):

-wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
+wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)

 {
     Init(data);
 }
 {
     Init(data);
 }


@@ -598,7 +596,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
                 _("Page Setup"),
                 wxPoint(0, 0),
                 wxSize(600, 600),
                 _("Page Setup"),
                 wxPoint(0, 0),
                 wxSize(600, 600),

-                wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
+                wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )

 {
     if (data)
         m_pageData = *data;
 {
     if (data)
         m_pageData = *data;


@@ -705,21 +703,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)
     {