Fixed copyrights and licence spelling

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index e3fec631d5c800d982b747f3c20058f66d4d89bd..8ea2895984b0b07c61fe06c30590375b3767f0d7 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -28,8 +28,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP


@@ -48,6 +46,7 @@
     #include "wx/combobox.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"
     #include "wx/combobox.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"

+    #include "wx/cmndata.h"

 #endif
 
 #if wxUSE_STATLINE
 #endif
 
 #if wxUSE_STATLINE


@@ -62,6 +61,7 @@
 
 #include "wx/printdlg.h"
 #include "wx/paper.h"
 
 #include "wx/printdlg.h"
 #include "wx/paper.h"

+#include "wx/filename.h"

 
 // For print paper things
 #include "wx/prntbase.h"
 
 // For print paper things
 #include "wx/prntbase.h"


@@ -73,26 +73,25 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 

-    IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
-    IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)

 
 

-    BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
-        EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
-        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
-        EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
-    END_EVENT_TABLE()
-#endif
+BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
+    EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
+    EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
+END_EVENT_TABLE()
+
+#endif // wxUSE_POSTSCRIPT

 
 

-    IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)

 
 

-    BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
-        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
-    END_EVENT_TABLE()
-#endif // USE_SHARED_LIBRARY
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
+END_EVENT_TABLE()

 
 // ----------------------------------------------------------------------------
 // global vars
 
 // ----------------------------------------------------------------------------
 // global vars


@@ -102,10 +101,6 @@ extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 

-// ============================================================================
-// implementation
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // Generic print dialog for non-Windows printing use.
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Generic print dialog for non-Windows printing use.
 // ----------------------------------------------------------------------------


@@ -176,8 +171,8 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
                                          2, choices,
                                          1, wxRA_VERTICAL);
         m_rangeRadioBox->SetSelection(1);
                                          2, choices,
                                          1, wxRA_VERTICAL);
         m_rangeRadioBox->SetSelection(1);

-       
-       mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
+
+        mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );

     }
 
     // 3) bottom row
     }
 
     // 3) bottom row


@@ -187,16 +182,16 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     if (m_printDialogData.GetFromPage() != 0)
     {
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
     if (m_printDialogData.GetFromPage() != 0)
     {
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );

-        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxDefaultPosition, wxSize(40, -1));
-       bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
+        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxT(""), wxDefaultPosition, wxSize(40, -1));
+        bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );

 
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
 
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);

-        m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxDefaultPosition, wxSize(40, -1));
-       bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
+        m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxT(""), wxDefaultPosition, wxSize(40, -1));
+        bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );

     }
 
     bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );
     }
 
     bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );

-    m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1));
+    m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxT(""), wxPoint(252, 130), wxSize(40, -1));

     bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
 
     mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
     bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
 
     mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );


@@ -235,9 +230,7 @@ int wxGenericPrintDialog::ShowModal()
         int ret = genericPrintSetupDialog->ShowModal();
         if ( ret != wxID_CANCEL )
         {
         int ret = genericPrintSetupDialog->ShowModal();
         if ( ret != wxID_CANCEL )
         {

-            // Transfer settings to the global object (for compatibility) and to
-            // the print dialog's print data.
-            *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
+            // Transfer settings to  the print dialog's print data.

             m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
         }
         genericPrintSetupDialog->Destroy();
             m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
         }
         genericPrintSetupDialog->Destroy();


@@ -269,22 +262,18 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     if (m_printDialogData.GetPrintToFile())
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
     if (m_printDialogData.GetPrintToFile())
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);

-        wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_FILE);
-
-        wxString f = wxFileSelector(_("PostScript file"),
-            wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
-            wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
-            wxT("ps"), wxT("*.ps"), 0, this);
-        if ( f.IsEmpty() )
-            return;
+        
+        wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
+        
+        wxFileDialog dialog( this, _("PostScript file"),
+            fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
+        if (dialog.ShowModal() != wxID_OK) return;

 
 

-        m_printDialogData.GetPrintData().SetFilename(f);
-        wxThePrintSetupData->SetPrinterFile(f);
+        m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );

     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);

-        wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);

     }
 
     EndModal(wxID_OK);
     }
 
     EndModal(wxID_OK);


@@ -308,23 +297,15 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {

-   *wxThePrintSetupData = m_printDialogData.GetPrintData();
-    wxGenericPrintSetupDialog *genericPrintSetupDialog =
-        new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
-    int ret = genericPrintSetupDialog->ShowModal();
-    if ( ret != wxID_CANCEL )
+    wxGenericPrintSetupDialog dialog( this, &m_printDialogData.GetPrintData() );
+    if (dialog.ShowModal() != wxID_CANCEL)

     {
     {

-        *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
-        m_printDialogData = genericPrintSetupDialog->GetPrintData();
+        m_printDialogData = dialog.GetPrintData();

     }
     }

-
-    genericPrintSetupDialog->Close(TRUE);

 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {
 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {

-    char buf[10];
-

     if(m_printDialogData.GetFromPage() != 0)
     {
        if(m_fromText)
     if(m_printDialogData.GetFromPage() != 0)
     {
        if(m_fromText)


@@ -333,10 +314,10 @@ bool wxGenericPrintDialog::TransferDataToWindow()
           {
              m_fromText->Enable(TRUE);
              m_toText->Enable(TRUE);
           {
              m_fromText->Enable(TRUE);
              m_toText->Enable(TRUE);

-             sprintf(buf, "%d", m_printDialogData.GetFromPage());
-             m_fromText->SetValue(buf);
-             sprintf(buf, "%d", m_printDialogData.GetToPage());
-             m_toText->SetValue(buf);
+             m_fromText->SetValue(
+                 wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
+             m_toText->SetValue(
+                wxString::Format(_T("%d"), m_printDialogData.GetToPage()));

              if(m_rangeRadioBox)
                 if (m_printDialogData.GetAllPages())
                    m_rangeRadioBox->SetSelection(0);
              if(m_rangeRadioBox)
                 if (m_printDialogData.GetAllPages())
                    m_rangeRadioBox->SetSelection(0);


@@ -355,8 +336,8 @@ bool wxGenericPrintDialog::TransferDataToWindow()
           }
        }
     }
           }
        }
     }

-    sprintf(buf, "%d", m_printDialogData.GetNoCopies());
-    m_noCopiesText->SetValue(buf);
+    m_noCopiesText->SetValue(
+        wxString::Format(_T("%d"), m_printDialogData.GetNoCopies()));

 
     m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
     m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());
 
     m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
     m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());


@@ -365,12 +346,23 @@ bool wxGenericPrintDialog::TransferDataToWindow()
 
 bool wxGenericPrintDialog::TransferDataFromWindow()
 {
 
 bool wxGenericPrintDialog::TransferDataFromWindow()
 {

+    long res = 0;

     if(m_printDialogData.GetFromPage() != -1)
     {
         if (m_printDialogData.GetEnablePageNumbers())
         {
     if(m_printDialogData.GetFromPage() != -1)
     {
         if (m_printDialogData.GetEnablePageNumbers())
         {

-           if(m_fromText) m_printDialogData.SetFromPage(wxAtoi(m_fromText->GetValue()));
-           if(m_toText)   m_printDialogData.SetToPage(wxAtoi(m_toText->GetValue()));
+            if(m_fromText)
+            {
+                wxString value = m_fromText->GetValue();
+                if (value.ToLong( &res ))
+                    m_printDialogData.SetFromPage( res );
+            }
+            if(m_toText)
+            {   
+                wxString value = m_toText->GetValue();
+                if (value.ToLong( &res ))
+                    m_printDialogData.SetToPage( res );
+            }

         }
         if(m_rangeRadioBox)
         {
         }
         if(m_rangeRadioBox)
         {


@@ -385,7 +377,11 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
         m_printDialogData.SetFromPage(1);
         m_printDialogData.SetToPage(32000);
     }
         m_printDialogData.SetFromPage(1);
         m_printDialogData.SetToPage(32000);
     }

-    m_printDialogData.SetNoCopies(wxAtoi(m_noCopiesText->GetValue()));
+    
+    wxString value = m_noCopiesText->GetValue();
+    if (value.ToLong( &res ))
+        m_printDialogData.SetNoCopies( res );
+        

     m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
 
     return TRUE;
     m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
 
     return TRUE;


@@ -412,19 +408,6 @@ wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAUL
     Init(data);
 }
 
     Init(data);
 }
 

-// Convert wxPrintSetupData to standard wxPrintData object
-wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data):
-wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
-{
-    wxPrintData printData;
-    if (data)
-        printData = * data;
-    else
-        printData = * wxThePrintSetupData;
-
-    Init(& printData);
-}
-

 void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 {
     if ( data )
 void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 {
     if ( data )


@@ -460,18 +443,18 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
 
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
 

-    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, "", wxPoint(360, 55), wxSize(150, -1));
+    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxT(""), wxPoint(360, 55), wxSize(150, -1));

 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
 
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
 

-    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, "", wxPoint(360, 135), wxSize(150, -1));
+    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxT(""), wxPoint(360, 135), wxSize(150, -1));

 
     wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(80, -1));
     (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(80, -1));
 
     okButton->SetDefault();
     okButton->SetFocus();
 
     wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(80, -1));
     (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(80, -1));
 
     okButton->SetDefault();
     okButton->SetFocus();

-
+    

     Fit();
     Centre(wxBOTH);
 
     Fit();
     Centre(wxBOTH);
 


@@ -521,12 +504,10 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
     if (m_paperTypeChoice)
     {
         wxString val(m_paperTypeChoice->GetStringSelection());
     if (m_paperTypeChoice)
     {
         wxString val(m_paperTypeChoice->GetStringSelection());

-        if (!val.IsNull() && val != "")
+        if (!val.IsNull() && val != wxT(""))

             m_printData.SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(val));
     }
 
             m_printData.SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(val));
     }
 

-    // This is for backward compatibility only
-    *wxThePrintSetupData = GetPrintData();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -539,13 +520,13 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
         wxThePrintPaperDatabase->CreateDatabase();
     }
 */
         wxThePrintPaperDatabase->CreateDatabase();
     }
 */

-    int n = wxThePrintPaperDatabase->Number();
-    wxString *choices = new wxString [n];
-    int sel = 0;
-    int i;
-    for (i = 0; i < n; i++)
+    size_t      n = wxThePrintPaperDatabase->GetCount();
+    wxString   *choices = new wxString [n];
+    size_t      sel = 0;
+
+    for (size_t i = 0; i < n; i++)

     {
     {

-        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
+        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Item(i)->GetData();

         choices[i] = paper->GetName();
         if (m_printData.GetPaperId() == paper->GetId())
             sel = i;
         choices[i] = paper->GetName();
         if (m_printData.GetPaperId() == paper->GetId())
             sel = i;


@@ -553,10 +534,12 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 
     int width = 250;
 
 
     int width = 250;
 

-    wxComboBox *choice = new wxComboBox(this, wxPRINTID_PAPERSIZE,
-                                        _("Paper Size"),
-                                        wxPoint(*x, *y), wxSize(width, -1), n,
-        choices);
+    wxComboBox *choice = new wxComboBox( this,
+                                         wxPRINTID_PAPERSIZE,
+                                         _("Paper Size"),
+                                         wxPoint(*x, *y),
+                                         wxSize(width, -1),
+                                         n, choices );

 
     //    SetFont(thisFont);
 
 
     //    SetFont(thisFont);
 


@@ -602,31 +585,41 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
     TransferDataToWindow();
 }
 
     TransferDataToWindow();
 }
 

-wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data):
-wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
+wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
+                                                    wxPageSetupData* data)
+    : wxDialog( parent,
+                -1,
+                _("Page Setup"),
+                wxPoint(0, 0),
+                wxSize(600, 600),
+                wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )

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

-       
+

     int textWidth = 80;
     int textWidth = 80;

-       
+

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

-    
+

     // 1) top
     wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( 
       new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL );
     // 1) top
     wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( 
       new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL );

-    
-    int n = wxThePrintPaperDatabase->Number();
-    wxString *choices = new wxString [n];
-    int i;
-    for (i = 0; i < n; i++)
+
+    size_t      n = wxThePrintPaperDatabase->GetCount();
+    wxString   *choices = new wxString [n];
+
+    for (size_t i = 0; i < n; i++)

     {
     {

-        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
+        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Item(i)->GetData();

         choices[i] = paper->GetName();
     }
 
         choices[i] = paper->GetName();
     }
 

-    m_paperTypeChoice = new wxComboBox(this, wxPRINTID_PAPERSIZE, _("Paper Size"),
-                                        wxDefaultPosition, wxSize(300, -1), n, choices);
+    m_paperTypeChoice = new wxComboBox( this,
+                                        wxPRINTID_PAPERSIZE,
+                                        _("Paper Size"),
+                                        wxDefaultPosition,
+                                        wxSize(300, -1),
+                                        n, choices );

     topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
 //  m_paperTypeChoice->SetSelection(sel);
 
     topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
 //  m_paperTypeChoice->SetSelection(sel);
 


@@ -653,8 +646,8 @@ wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_
     table->Add( column1, 0, wxALL | wxEXPAND, 5 );
     
     wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );
     table->Add( column1, 0, wxALL | wxEXPAND, 5 );
     
     wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );

-    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
-    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
+    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));
+    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));

     column2->Add( m_marginLeftText, 1, wxALL, 5 );
     column2->Add( m_marginTopText, 1, wxALL, 5 );
     table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
     column2->Add( m_marginLeftText, 1, wxALL, 5 );
     column2->Add( m_marginTopText, 1, wxALL, 5 );
     table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );


@@ -665,8 +658,8 @@ wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_
     table->Add( column3, 0, wxALL | wxEXPAND, 5 );
     
     wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );
     table->Add( column3, 0, wxALL | wxEXPAND, 5 );
     
     wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );

-    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
-    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
+    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));
+    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));

     column4->Add( m_marginRightText, 1, wxALL, 5 );
     column4->Add( m_marginBottomText, 1, wxALL, 5 );
     table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
     column4->Add( m_marginRightText, 1, wxALL, 5 );
     column4->Add( m_marginBottomText, 1, wxALL, 5 );
     table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );


@@ -745,32 +738,35 @@ bool wxGenericPageSetupDialog::TransferDataToWindow()
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)

-        m_pageData.SetMarginTopLeft(wxPoint(wxAtoi((const wxChar *)m_marginLeftText->GetValue()),wxAtoi((const wxChar *)m_marginTopText->GetValue())));
+    {
+        int left = wxAtoi( m_marginLeftText->GetValue().c_str() );
+        int top = wxAtoi( m_marginTopText->GetValue().c_str() );
+        m_pageData.SetMarginTopLeft( wxPoint(left,top) );
+    }

     if (m_marginRightText && m_marginBottomText)
     if (m_marginRightText && m_marginBottomText)

-        m_pageData.SetMarginBottomRight(wxPoint(wxAtoi((const wxChar *)m_marginRightText->GetValue()),wxAtoi((const wxChar *)m_marginBottomText->GetValue())));
+    {
+        int right = wxAtoi( m_marginRightText->GetValue().c_str() );
+        int bottom = wxAtoi( m_marginBottomText->GetValue().c_str() );
+        m_pageData.SetMarginBottomRight( wxPoint(right,bottom) );
+    }

 
     if (m_orientationRadioBox)
     {
         int sel = m_orientationRadioBox->GetSelection();
         if (sel == 0)
         {
 
     if (m_orientationRadioBox)
     {
         int sel = m_orientationRadioBox->GetSelection();
         if (sel == 0)
         {

-#if wxUSE_POSTSCRIPT
-            wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT);
-#endif

             m_pageData.GetPrintData().SetOrientation(wxPORTRAIT);
         }
         else
         {
             m_pageData.GetPrintData().SetOrientation(wxPORTRAIT);
         }
         else
         {

-#if wxUSE_POSTSCRIPT
-            wxThePrintSetupData->SetPrinterOrientation(wxLANDSCAPE);
-#endif

             m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE);
         }
     }
             m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE);
         }
     }

+    

     if (m_paperTypeChoice)
     {
         wxString val(m_paperTypeChoice->GetStringSelection());
     if (m_paperTypeChoice)
     {
         wxString val(m_paperTypeChoice->GetStringSelection());

-        if (!val.IsNull() && val != "")
+        if (!val.IsEmpty())

         {
             wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(val);
             if ( paper )
         {
             wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(val);
             if ( paper )


@@ -794,22 +790,24 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
     }
 */
 
     }
 */
 

-    int n = wxThePrintPaperDatabase->Number();
-    wxString *choices = new wxString [n];
-    int i;
-    for (i = 0; i < n; i++)
+    size_t      n = wxThePrintPaperDatabase->GetCount();
+    wxString   *choices = new wxString [n];
+
+    for (size_t i = 0; i < n; i++)

     {
     {

-        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
+        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Item(i)->GetData();

         choices[i] = paper->GetName();
     }
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(*x, *y));
     *y += 25;
 
         choices[i] = paper->GetName();
     }
 
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(*x, *y));
     *y += 25;
 

-    wxComboBox *choice = new wxComboBox(this, wxPRINTID_PAPERSIZE,
-                                        _("Paper Size"),
-                                        wxPoint(*x, *y), wxSize(300, -1), n,
-        choices);
+    wxComboBox *choice = new wxComboBox( this,
+                                         wxPRINTID_PAPERSIZE,
+                                         _("Paper Size"),
+                                         wxPoint(*x, *y),
+                                         wxSize(300, -1),
+                                         n, choices );

     *y += 35;
     delete[] choices;
 
     *y += 35;
     delete[] choices;
 


@@ -818,3 +816,4 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 }
 
 #endif
 }
 
 #endif

+