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 2b03bcf839c64a7329cbd8cf3790c2ab984fb994..56c73814fa28cd69caa481051ff9b34d6e4f1e79 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -56,55 +56,84 @@
     #include "wx/generic/dcpsg.h"
 #endif
 
     #include "wx/generic/dcpsg.h"
 #endif
 

+#include "wx/prntbase.h"

 #include "wx/printdlg.h"
 #include "wx/paper.h"
 #include "wx/filename.h"
 
 #include "wx/printdlg.h"
 #include "wx/paper.h"
 #include "wx/filename.h"
 

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

 #include <stdlib.h>
 #include <string.h>
 
 // ----------------------------------------------------------------------------
 #include <stdlib.h>
 #include <string.h>
 
 // ----------------------------------------------------------------------------

-// wxWin macros
+// global vars

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+extern wxPrintPaperDatabase *wxThePrintPaperDatabase;

 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 

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

 
 

-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()
+IMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase)

 
 

-#endif // wxUSE_POSTSCRIPT
+wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
+{
+    m_previewCommand = wxT("");
+#ifdef __VMS__
+    m_printerCommand = wxT("print");
+    m_printerOptions = wxT("/nonotify/queue=psqueue");
+    m_afmPath = wxT("sys$ps_font_metrics:");
+#endif

 
 

-IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+#ifdef __WXMSW__
+    m_printerCommand = wxT("print");
+    m_printerOptions = wxT("");
+    m_afmPath = wxT("c:\\windows\\system\\");
+#endif

 
 

-BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
-    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
-END_EVENT_TABLE()
+#if !defined(__VMS__) && !defined(__WXMSW__)
+    m_printerCommand = wxT("lpr");
+    m_printerOptions = wxT("");
+    m_afmPath = wxT("");
+#endif

 
 

-// ----------------------------------------------------------------------------
-// global vars
-// ----------------------------------------------------------------------------
+    m_printerScaleX = 1.0;
+    m_printerScaleY = 1.0;
+    m_printerTranslateX = 0;
+    m_printerTranslateY = 0;
+}

 
 

-extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
+wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData()
+{
+}

 
 

-#if wxUSE_POSTSCRIPT
+bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &data )
+{
+    return true;
+}
+
+bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &data )
+{
+    return true;
+}

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

+IMPLEMENT_CLASS(wxGenericPrintDialog, wxPrintDialogBase)
+
+BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxPrintDialogBase)
+    EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
+    EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
+END_EVENT_TABLE()
+

 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)

-                    : wxDialog(parent, wxID_ANY, _("Print"),
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),

                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)


@@ -117,7 +146,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)

-                    : wxDialog(parent, wxID_ANY, _("Print"),
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),

                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)


@@ -134,20 +163,43 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
   //                     wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
   //                     wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );

-
+    

     // 1) top row
 
     // 1) top row
 

+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+

     wxStaticBoxSizer *topsizer = new wxStaticBoxSizer(
         new wxStaticBox( this, wxID_ANY, _( "Printer options" ) ), wxHORIZONTAL );
     wxStaticBoxSizer *topsizer = new wxStaticBoxSizer(
         new wxStaticBox( this, wxID_ANY, _( "Printer options" ) ), wxHORIZONTAL );

+    wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
+    flex->AddGrowableCol( 1 );
+    topsizer->Add( flex, 1, wxGROW );
+        

     m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") );
     m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") );

-    topsizer->Add( m_printToFileCheckBox, 0, wxCENTER|wxALL, 5 );
-
-    topsizer->Add( 60,2,1 );
-
+    flex->Add( m_printToFileCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    

     m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );
     m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );

-    topsizer->Add( m_setupButton, 0, wxCENTER|wxALL, 5 );
+    flex->Add( m_setupButton, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
+    
+    if (!factory->HasPrintSetupDialog())
+        m_setupButton->Enable( false );
+        
+    if (factory->HasPrinterLine())
+    {
+        flex->Add( new wxStaticText( this, -1, _("Printer:") ), 
+            0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+        flex->Add( new wxStaticText( this, -1, factory->CreatePrinterLine() ), 
+            0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    }

 
 

-    mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
+    if (factory->HasStatusLine())
+    {
+        flex->Add( new wxStaticText( this, -1, _("Status:") ), 
+            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+        flex->Add( new wxStaticText( this, -1, factory->CreateStatusLine() ), 
+            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+    }
+
+    mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );

 
     // 2) middle row with radio box
 
 
     // 2) middle row with radio box
 


@@ -213,33 +265,7 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 
 int wxGenericPrintDialog::ShowModal()
 {
 
 int wxGenericPrintDialog::ShowModal()
 {

-    if ( m_printDialogData.GetSetupDialog() )
-    {
-        // Make sure wxPrintData object reflects the settings now, in case the setup dialog
-        // changes it. In fact there aren't any common settings at
-        // present, but there might be in future.
-        // TransferDataFromWindow();
-
-        wxGenericPrintSetupDialog *genericPrintSetupDialog =
-            new wxGenericPrintSetupDialog(this, & m_printDialogData.GetPrintData());
-        int ret = genericPrintSetupDialog->ShowModal();
-        if ( ret != wxID_CANCEL )
-        {
-            // Transfer settings to  the print dialog's print data.
-            m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
-        }
-        genericPrintSetupDialog->Destroy();
-
-        // Restore the wxPrintData settings again (uncomment if any settings become common
-        // to both dialogs)
-        // TransferDataToWindow();
-
-        return ret;
-    }
-    else
-    {
-        return wxDialog::ShowModal();
-    }
+    return wxDialog::ShowModal();

 }
 
 wxGenericPrintDialog::~wxGenericPrintDialog()
 }
 
 wxGenericPrintDialog::~wxGenericPrintDialog()


@@ -268,14 +294,14 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         wxFileDialog dialog( this, _("PostScript file"),
             fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
         if (dialog.ShowModal() != wxID_OK) return;
         wxFileDialog dialog( this, _("PostScript file"),
             fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
         if (dialog.ShowModal() != wxID_OK) return;

-
+        

         m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
     }
         m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
     }

-
+    

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


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

-    wxGenericPrintSetupDialog dialog( this, &m_printDialogData.GetPrintData() );
-    if (dialog.ShowModal() != wxID_CANCEL)
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+
+    if (factory->HasPrintSetupDialog())

     {
     {

-        m_printDialogData = dialog.GetPrintData();
+        // The print setup dialog should change the
+        // print data in-place if not cancelled.
+        wxDialog *dialog = factory->CreatePrintSetupDialog( this, &m_printDialogData.GetPrintData() );
+        dialog->ShowModal();
+        dialog->Destroy();

     }
 }
 
     }
 }
 


@@ -366,10 +397,16 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
         }
         if(m_rangeRadioBox)
         {
         }
         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
         }
     }
     else


@@ -387,21 +424,17 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
     return true;
 }
 
     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()
 {
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {

-  //    return new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), false, (wxWindow *) NULL);
-  return new wxPostScriptDC(GetPrintDialogData().GetPrintData());
+    return new wxPostScriptDC(GetPrintDialogData().GetPrintData());

 }
 
 // ----------------------------------------------------------------------------
 // Generic print setup dialog
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // Generic print setup dialog
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
+

 wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
 wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
 {
 wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
 wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
 {


@@ -413,53 +446,94 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
     if ( data )
         m_printData = *data;
 
     if ( data )
         m_printData = *data;
 

-    int staticBoxWidth = 300;

 
 

-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(10, 10), wxSize(staticBoxWidth, 60) );
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );

 
 

-    int xPos = 20;
-    int yPos = 30;
-    m_paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+    main_sizer->Add( item1, 0, wxALL, 5 );

 
 

-    wxString *choices =  new wxString[2];
-    choices[0] = _("Portrait");
-    choices[1] = _("Landscape");
+    // printer options (on the left)

 
 

-    m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
-        wxPoint(10, 80), wxDefaultSize, 2, choices, 1, wxRA_VERTICAL );
-    m_orientationRadioBox->SetSelection(0);
+    wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL );

 
 

-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(staticBoxWidth, 50) );
+    wxStaticBox *item4 = new wxStaticBox( this, wxPRINTID_STATIC, _("Paper size") );
+    wxStaticBoxSizer *item3 = new wxStaticBoxSizer( item4, wxVERTICAL );

 
 

-    int colourYPos = 145;
+    m_paperTypeChoice = CreatePaperTypeChoice();
+    item3->Add( m_paperTypeChoice, 0, wxALIGN_CENTER|wxALL, 5 );

 
 

-#ifdef __WXMOTIF__
-    colourYPos = 150;
-#endif
+    item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );

 
 

-    m_colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourYPos));
+    wxString strs6[] = 
+    {
+        _("Portrait"), 
+        _("Landscape")
+    };
+    m_orientationRadioBox= new wxRadioBox( this, wxPRINTID_ORIENTATION, _("Orientation"), wxDefaultPosition, wxDefaultSize, 2, strs6, 1, wxRA_SPECIFY_ROWS );
+    item2->Add( m_orientationRadioBox, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );

 
 

-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(330, 10), wxSize(200,170) );
+    wxStaticBox *item8 = new wxStaticBox( this, -1, _("Options") );
+    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxHORIZONTAL );

 
 

-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
+    m_colourCheckBox = new wxCheckBox( this, wxPRINTID_PRINTCOLOUR, _("Print in colour") );
+    item7->Add( m_colourCheckBox, 0, wxALIGN_CENTER|wxALL, 5 );

 
 

-    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxEmptyString, wxPoint(360, 55), wxSize(150, wxDefaultCoord));
+    item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );

 
 

-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
+    item1->Add( item2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );

 
 

-    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxEmptyString, wxPoint(360, 135), wxSize(150, wxDefaultCoord));
+    // spooling options (on the right)

 
 

-    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(80, wxDefaultCoord));
-    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(80, wxDefaultCoord));
+    wxStaticBox *item11 = new wxStaticBox( this, -1, _("Print spooling") );
+    wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL );
+
+    wxStaticText *item12 = new wxStaticText( this, -1, _("Printer command:") );
+    item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
+
+    item13->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxT(""), wxDefaultPosition, wxSize(160,-1) );
+    item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 );
+
+    wxStaticText *item15 = new wxStaticText( this, -1, _("Printer options:") );
+    item10->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxBoxSizer *item16 = new wxBoxSizer( wxHORIZONTAL );
+
+    item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxT(""), wxDefaultPosition, wxSize(160,-1) );
+    item16->Add( m_printerOptionsText, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item10->Add( item16, 0, wxALIGN_CENTER|wxALL, 0 );
+
+    item1->Add( item10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+
+#if wxUSE_STATLINE
+    // static line
+    main_sizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
+
+    // buttons
+
+    main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
+
+    SetAutoLayout( true );
+    SetSizer( main_sizer );
+
+    main_sizer->Fit( this );
+    Centre(wxBOTH);

 
 

-    okButton->SetDefault();
-    okButton->SetFocus();

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

-    delete[] choices;

 }
 
 wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog()
 }
 
 wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog()


@@ -468,10 +542,13 @@ wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog()
 
 bool wxGenericPrintSetupDialog::TransferDataToWindow()
 {
 
 bool wxGenericPrintSetupDialog::TransferDataToWindow()
 {

-    if (m_printerCommandText && m_printData.GetPrinterCommand())
-        m_printerCommandText->SetValue(m_printData.GetPrinterCommand());
-    if (m_printerOptionsText && m_printData.GetPrinterOptions())
-        m_printerOptionsText->SetValue(m_printData.GetPrinterOptions());
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    if (m_printerCommandText && data->GetPrinterCommand())
+        m_printerCommandText->SetValue(data->GetPrinterCommand());
+    if (m_printerOptionsText && data->GetPrinterOptions())
+        m_printerOptionsText->SetValue(data->GetPrinterOptions());

     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());
 
     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());
 


@@ -487,10 +564,13 @@ bool wxGenericPrintSetupDialog::TransferDataToWindow()
 
 bool wxGenericPrintSetupDialog::TransferDataFromWindow()
 {
 
 bool wxGenericPrintSetupDialog::TransferDataFromWindow()
 {

+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+

     if (m_printerCommandText)
     if (m_printerCommandText)

-        m_printData.SetPrinterCommand(m_printerCommandText->GetValue());
+        data->SetPrinterCommand(m_printerCommandText->GetValue());

     if (m_printerOptionsText)
     if (m_printerOptionsText)

-        m_printData.SetPrinterOptions(m_printerOptionsText->GetValue());
+        data->SetPrinterOptions(m_printerOptionsText->GetValue());

     if (m_colourCheckBox)
         m_printData.SetColour(m_colourCheckBox->GetValue());
     if (m_orientationRadioBox)
     if (m_colourCheckBox)
         m_printData.SetColour(m_colourCheckBox->GetValue());
     if (m_orientationRadioBox)


@@ -515,18 +595,11 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
     return true;
 }
 
     return true;
 }
 

-wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice()

 {
 {

-/* Should not be necessary
-    if (!wxThePrintPaperDatabase)
-    {
-        wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-        wxThePrintPaperDatabase->CreateDatabase();
-    }
-*/
-    size_t      n = wxThePrintPaperDatabase->GetCount();
-    wxString   *choices = new wxString [n];
-    size_t      sel = 0;
+    size_t n = wxThePrintPaperDatabase->GetCount();
+    wxString *choices = new wxString [n];
+    size_t sel = 0;

 
     for (size_t i = 0; i < n; i++)
     {
 
     for (size_t i = 0; i < n; i++)
     {


@@ -541,23 +614,28 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,
                                          _("Paper Size"),
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,
                                          _("Paper Size"),

-                                         wxPoint(*x, *y),
+                                         wxDefaultPosition,

                                          wxSize(width, wxDefaultCoord),
                                          n, choices );
 
                                          wxSize(width, wxDefaultCoord),
                                          n, choices );
 

-    //    SetFont(thisFont);
-

     delete[] choices;
 
     choice->SetSelection(sel);
     return choice;
 }
     delete[] choices;
 
     choice->SetSelection(sel);
     return choice;
 }

+

 #endif // wxUSE_POSTSCRIPT
 
 // ----------------------------------------------------------------------------
 // Generic page setup dialog
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_POSTSCRIPT
 
 // ----------------------------------------------------------------------------
 // Generic page setup dialog
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
+END_EVENT_TABLE()
+

 void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
 {
     // We no longer query GetPrintMode, so we can eliminate the need
 void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
 {
     // We no longer query GetPrintMode, so we can eliminate the need


@@ -575,16 +653,14 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
     wxPrintDialogData data;
     data = GetPageSetupData().GetPrintData();
     data.SetSetupDialog(true);
     wxPrintDialogData data;
     data = GetPageSetupData().GetPrintData();
     data.SetSetupDialog(true);

-    wxPrintDialog *printDialog = new wxPrintDialog(this, & data);
-    printDialog->ShowModal();
+    wxPrintDialog printDialog(this, & data);
+    printDialog.ShowModal();

 
     // Transfer the page setup print settings from the page dialog to this dialog again, in case
     // the page setup dialog changed something.
 
     // Transfer the page setup print settings from the page dialog to this dialog again, in case
     // the page setup dialog changed something.

-    GetPageSetupData().GetPrintData() = printDialog->GetPrintDialogData().GetPrintData();
+    GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData();

     GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData
 
     GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData
 

-    printDialog->Destroy();
-

     // Now update the dialog in case the page setup dialog changed some of our settings.
     TransferDataToWindow();
 }
     // Now update the dialog in case the page setup dialog changed some of our settings.
     TransferDataToWindow();
 }