]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/prntdlgg.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
never return NULL_BRUSH from WM_CTLCOLOR handler, it doesn't do much for most control...
[wxWidgets.git] / src / generic / prntdlgg.cpp
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 45682912d36f105755d839a4a5444745afefca2b..9b9e3846c01163f0afd1eb1aba6310643eca89f2 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -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,13 +28,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
+#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
-    #include "wx/app.h"
-    #include "wx/frame.h"
     #include "wx/stattext.h"
     #include "wx/statbox.h"
     #include "wx/button.h"
     #include "wx/stattext.h"
     #include "wx/statbox.h"
     #include "wx/button.h"
@@ -42,8 +40,14 @@
     #include "wx/textctrl.h"
     #include "wx/radiobox.h"
     #include "wx/filedlg.h"
     #include "wx/textctrl.h"
     #include "wx/radiobox.h"
     #include "wx/filedlg.h"
-    #include "wx/choice.h"
-    #include <wx/intl.h>
+    #include "wx/combobox.h"
+    #include "wx/intl.h"
+    #include "wx/sizer.h"
+    #include "wx/cmndata.h"
+#endif
+
+#if wxUSE_STATLINE
+  #include "wx/statline.h"
 #endif
 
 #include "wx/generic/prntdlgg.h"
 #endif
 
 #include "wx/generic/prntdlgg.h"
@@ -52,57 +56,88 @@
     #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/printdlg.h"
 #include "wx/paper.h"
-
-// For print paper things
-#include "wx/prntbase.h"
+#include "wx/filename.h"
+#include "wx/tokenzr.h"
+#include "wx/imaglist.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
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
-    IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
-    IMPLEMENT_CLASS(wxGenericPageSetupDialog, 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)
 
 
-    BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
-        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
-    END_EVENT_TABLE()
-#endif // USE_SHARED_LIBRARY
+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
 
 
-// ----------------------------------------------------------------------------
-// global vars
-// ----------------------------------------------------------------------------
+#ifdef __WXMSW__
+    m_printerCommand = wxT("print");
+    m_printerOptions = wxT("");
+    m_afmPath = wxT("c:\\windows\\system\\");
+#endif
 
 
-extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
+#if !defined(__VMS__) && !defined(__WXMSW__)
+    m_printerCommand = wxT("lpr");
+    m_printerOptions = wxT("");
+    m_afmPath = wxT("");
+#endif
 
 
-// ============================================================================
-// implementation
-// ============================================================================
+    m_printerScaleX = 1.0;
+    m_printerScaleY = 1.0;
+    m_printerTranslateX = 0;
+    m_printerTranslateY = 0;
+}
+
+wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData()
+{
+}
+
+bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &WXUNUSED(data) )
+{
+    return true;
+}
+
+bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &WXUNUSED(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, -1, _("Print"),
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
-                               wxDIALOG_MODAL |
                                wxTAB_TRAVERSAL)
 {
     if ( data )
                                wxTAB_TRAVERSAL)
 {
     if ( data )
@@ -113,28 +148,62 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
-                    : wxDialog(parent, -1, _("Print"),
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxPoint(0, 0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
-                               wxDIALOG_MODAL |
                                wxTAB_TRAVERSAL)
 {
     if ( data )
         m_printDialogData = *data;
                                wxTAB_TRAVERSAL)
 {
     if ( data )
         m_printDialogData = *data;
-
+        
     Init(parent);
 }
 
     Init(parent);
 }
 
-void wxGenericPrintDialog::Init(wxWindow *parent)
+void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 {
 {
-  //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
-  //                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
+  //    wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0, 0), wxSize(600, 600),
+  //                     wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
 
 
-    (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
+    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
+    
+    // 1) top row
+
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+
+    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") );
+    flex->Add( m_printToFileCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    
+    m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );
+    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 );
+    }
 
 
-    m_printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(20, 25) );
+    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 );
+    }
 
 
-    m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(160, 25), wxSize(100, -1));
+    mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
+
+    // 2) middle row with radio box
 
     wxString *choices = new wxString[2];
     choices[0] = _("All");
 
     wxString *choices = new wxString[2];
     choices[0] = _("All");
@@ -143,37 +212,52 @@ void wxGenericPrintDialog::Init(wxWindow *parent)
     m_fromText = (wxTextCtrl*)NULL;
     m_toText = (wxTextCtrl*)NULL;
     m_rangeRadioBox = (wxRadioBox *)NULL;
     m_fromText = (wxTextCtrl*)NULL;
     m_toText = (wxTextCtrl*)NULL;
     m_rangeRadioBox = (wxRadioBox *)NULL;
-    
+
     if (m_printDialogData.GetFromPage() != 0)
     {
         m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
     if (m_printDialogData.GetFromPage() != 0)
     {
         m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
-                                         wxPoint(5, 80), wxSize(-1, -1),
+                                         wxDefaultPosition, wxDefaultSize,
                                          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 );
     }
 
     }
 
-    if(m_printDialogData.GetFromPage() != 0)
-    {
-        (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(5, 135));
+    // 3) bottom row
 
 
-        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(45, 130), wxSize(40, -1));
+    wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
 
 
-        (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(100, 135));
+    if (m_printDialogData.GetFromPage() != 0)
+    {
+        bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
+        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord));
+        bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
 
 
-        m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(133, 130), wxSize(40, -1));
+        bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
+        m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord));
+        bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
     }
 
     }
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(200, 135));
+    bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );
+    m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxEmptyString, wxPoint(252, 130), wxSize(40, wxDefaultCoord));
+    bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
 
 
-    m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1));
+    mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
 
 
-    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(40, 180), wxSize(100, -1));
-    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(180, 180), wxSize(100, -1));
+#if wxUSE_STATLINE
+    // 4) static line
+    mainsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
 
 
-    okButton->SetDefault();
-    okButton->SetFocus();
-    Fit();
+    // 5) buttons
+
+    mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
+
+    SetAutoLayout( true );
+    SetSizer( mainsizer );
+
+    mainsizer->Fit( this );
     Centre(wxBOTH);
 
     // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
     Centre(wxBOTH);
 
     // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
@@ -183,35 +267,7 @@ void wxGenericPrintDialog::Init(wxWindow *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 global object (for compatibility) and to
-            // the print dialog's print data.
-            *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
-            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()
@@ -222,6 +278,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
@@ -229,24 +290,20 @@ 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()),
-            _T("ps"), _T("*.ps"), 0, this);
-        if ( f.IsEmpty() )
-            return;
+        wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
 
 
-        m_printDialogData.GetPrintData().SetFilename(f);
-        wxThePrintSetupData->SetPrinterFile(f);
+        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);
     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
-        wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);
     }
     }
-
+    
     EndModal(wxID_OK);
 }
 
     EndModal(wxID_OK);
 }
 
@@ -256,88 +313,102 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 
     if (event.GetInt() == 0)
     {
 
     if (event.GetInt() == 0)
     {
-        m_fromText->Enable(FALSE);
-        m_toText->Enable(FALSE);
+        m_fromText->Enable(false);
+        m_toText->Enable(false);
     }
     else if (event.GetInt() == 1)
     {
     }
     else if (event.GetInt() == 1)
     {
-        m_fromText->Enable(TRUE);
-        m_toText->Enable(TRUE);
+        m_fromText->Enable(true);
+        m_toText->Enable(true);
     }
 }
 
 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 )
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+
+    if (factory->HasPrintSetupDialog())
     {
     {
-        *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
-        m_printDialogData = genericPrintSetupDialog->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();
     }
     }
-
-    genericPrintSetupDialog->Close(TRUE);
 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {
 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {
-    char buf[10];
-
     if(m_printDialogData.GetFromPage() != 0)
     {
        if(m_fromText)
        {
           if (m_printDialogData.GetEnablePageNumbers())
           {
     if(m_printDialogData.GetFromPage() != 0)
     {
        if(m_fromText)
        {
           if (m_printDialogData.GetEnablePageNumbers())
           {
-             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->Enable(true);
+             m_toText->Enable(true);
+             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);
           }
           else
           {
                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);
           }
           else
           {
-             m_fromText->Enable(FALSE);
-             m_toText->Enable(FALSE);
+             m_fromText->Enable(false);
+             m_toText->Enable(false);
              if(m_rangeRadioBox)
              {
                 m_rangeRadioBox->SetSelection(0);
              if(m_rangeRadioBox)
              {
                 m_rangeRadioBox->SetSelection(0);
-                m_rangeRadioBox->wxRadioBox::Enable(1, FALSE);
+                m_rangeRadioBox->wxRadioBox::Enable(1, false);
              }
           }
        }
     }
              }
           }
        }
     }
-    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());
-    return TRUE;
+    return true;
 }
 
 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)
         {
-           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
@@ -345,110 +416,300 @@ 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()));
-    m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
 
 
-    return TRUE;
-}
+    wxString value = m_noCopiesText->GetValue();
+    if (value.ToLong( &res ))
+        m_printDialogData.SetNoCopies( res );
 
 
-/*
-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).
-*/
+    m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
+    
+    return true;
+}
 
 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)
+
+BEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog)
+    EVT_LIST_ITEM_ACTIVATED(wxPRINTID_PRINTER, wxGenericPrintSetupDialog::OnPrinter)
+END_EVENT_TABLE()
+
 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, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
 {
     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;
+/* XPM */
+static char * check_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 3 1",
+/* colors */
+"      s None  c None",
+"X     c #000000",
+".     c #808080",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"             .. ",
+"            XX  ",
+"           XX.  ",
+"          .XX   ",
+"          XX    ",
+"   X     XX.    ",
+"   XX   .XX     ",
+"    XX  XX      ",
+"     XXXX.      ",
+"      XX.       ",
+"       .        ",
+"                ",
+"                "
+};
 
 
-    Init(& printData);
-}
 
 void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 {
     if ( data )
         m_printData = *data;
 
 
 void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 {
     if ( data )
         m_printData = *data;
 
-    int staticBoxWidth = 300;
+    m_targetData = data;
 
 
-    (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);
+    // printer selection
+    
+    wxStaticBoxSizer *printer_sizer = new wxStaticBoxSizer( new wxStaticBox( this, -1, _("Printer") ), wxVERTICAL );
+    main_sizer->Add( printer_sizer, 0, wxALL|wxGROW, 10 );
+    
+    m_printerListCtrl = new wxListCtrl( this, wxPRINTID_PRINTER, 
+        wxDefaultPosition, wxSize(-1,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
+    wxImageList *image_list = new wxImageList;
+    image_list->Add( wxBitmap(check_xpm) );
+    m_printerListCtrl->AssignImageList( image_list, wxIMAGE_LIST_SMALL );
+        
+    m_printerListCtrl->InsertColumn( 0, wxT(" "), wxLIST_FORMAT_LEFT, 20 );
+    m_printerListCtrl->InsertColumn( 1, wxT("Printer"), wxLIST_FORMAT_LEFT, 150 );
+    m_printerListCtrl->InsertColumn( 2, wxT("Device"), wxLIST_FORMAT_LEFT, 150 );
+    m_printerListCtrl->InsertColumn( 3, wxT("Status"), wxLIST_FORMAT_LEFT, 80 );
+
+    wxListItem item;
+    item.SetMask( wxLIST_MASK_TEXT );
+    item.SetColumn( 1 );
+    item.SetText( _("Default printer") );
+    item.SetId( m_printerListCtrl->InsertItem( item ) );
+
+    if (data->GetPrinterName().IsEmpty())
+    {
+        wxListItem item2;
+        item2.SetId( item.GetId() );
+        item2.SetMask( wxLIST_MASK_IMAGE );
+        item2.SetImage( 0 );
+        m_printerListCtrl->SetItem( item2 );
+    }
 
 
-    wxString *choices =  new wxString[2];
-    choices[0] = _("Portrait");
-    choices[1] = _("Landscape");
+    item.SetId( 1+ item.GetId() );
 
 
-    m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
-        wxPoint(10, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL );
-    m_orientationRadioBox->SetSelection(0);
+    wxArrayString errors;
+    wxArrayString output;
+    long res = wxExecute( wxT("lpstat -v"), output, errors );
+    if (res >= 0 && errors.GetCount() == 0)
+    {
+        size_t i;
+        for (i = 0; i < output.GetCount(); i++)
+        {
+            wxStringTokenizer tok( output[i], wxT(" ") );
+            wxString tmp = tok.GetNextToken(); // "device"
+            if (tmp != wxT("device"))
+                break;  // the lpstat syntax must have changed.
+            tmp = tok.GetNextToken();          // "for"
+            if (tmp != wxT("for"))
+                break;  // the lpstat syntax must have changed.
+            tmp = tok.GetNextToken();          // "hp_deskjet930c:"
+            if (tmp[tmp.Len()-1] == wxT(':'))
+                tmp.Remove(tmp.Len()-1,1);
+            wxString name = tmp;
+            item.SetText( name );
+            item.SetId( m_printerListCtrl->InsertItem( item ) );
+            tmp = tok.GetNextToken();          // "parallel:/dev/lp0"
+            item.SetColumn( 2 );
+            item.SetText( tmp );
+            m_printerListCtrl->SetItem( item );
+            if (data->GetPrinterName() == name)
+            {
+                wxListItem item2;
+                item2.SetId( item.GetId() );
+                item2.SetMask( wxLIST_MASK_IMAGE );
+                item2.SetImage( 0 );
+                m_printerListCtrl->SetItem( item2 );
+            }
+            
+            wxString command = wxT("lpstat -p ");
+            command += name;
+            wxArrayString errors2;
+            wxArrayString output2;
+            res = wxExecute( command, output2, errors2 );
+            if (res >= 0 && errors2.GetCount() == 0 && output2.GetCount() > 0)
+            {
+                tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..."
+                int pos = tmp.Find( wxT('.') );
+                if (pos != -1)
+                    tmp.Remove( (size_t)pos, tmp.Len()-(size_t)pos );
+                wxStringTokenizer tok2( tmp, wxT(" ") );
+                tmp = tok2.GetNextToken();  // "printer"
+                tmp = tok2.GetNextToken();  // "hp_deskjet930c"
+                tmp = wxT("");
+                while (tok2.HasMoreTokens())
+                {
+                    tmp += tok2.GetNextToken();
+                    tmp += wxT(" ");
+                }
+                item.SetColumn( 3 );
+                item.SetText( tmp );
+                m_printerListCtrl->SetItem( item );
+            }
+            
+            item.SetColumn( 1 );
+            item.SetId( 1+ item.GetId() );
+        }
+    }
 
 
-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(staticBoxWidth, 50) );
+    
+    printer_sizer->Add( m_printerListCtrl, 0, wxALL|wxGROW, 5 );
 
 
-    int colourYPos = 145;
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+    main_sizer->Add( item1, 0, wxALL, 5 );
 
 
-#ifdef __WXMOTIF__
-    colourYPos = 150;
-#endif
+    // printer options (on the left)
+
+    wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBox *item4 = new wxStaticBox( this, wxPRINTID_STATIC, _("Paper size") );
+    wxStaticBoxSizer *item3 = new wxStaticBoxSizer( item4, wxVERTICAL );
+
+    m_paperTypeChoice = CreatePaperTypeChoice();
+    item3->Add( m_paperTypeChoice, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    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 );
+
+    wxStaticBox *item8 = new wxStaticBox( this, -1, _("Options") );
+    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxHORIZONTAL );
+
+    m_colourCheckBox = new wxCheckBox( this, wxPRINTID_PRINTCOLOUR, _("Print in colour") );
+    item7->Add( m_colourCheckBox, 0, wxALIGN_CENTER|wxALL, 5 );
 
 
-    m_colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourYPos));
+    item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(330, 10), wxSize(200,170) );
+    item1->Add( item2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
+    // spooling options (on the right)
 
 
-    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, "", wxPoint(360, 55), wxSize(150, -1));
+    wxStaticBox *item11 = new wxStaticBox( this, -1, _("Print spooling") );
+    wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL );
 
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
+    wxStaticText *item12 = new wxStaticText( this, -1, _("Printer command:") );
+    item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, "", wxPoint(360, 135), wxSize(150, -1));
+    wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(100, -1));
-    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(100, -1));
+    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()
 {
 }
 
+void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event)
+{
+    // Delete check mark
+    long item;
+    for (item = 0; item < m_printerListCtrl->GetItemCount(); item++)
+        m_printerListCtrl->SetItemImage( item, -1 );
+    
+    m_printerListCtrl->SetItemImage( event.GetIndex(), 0 );
+    
+    if (event.GetIndex() == 0)
+    {
+        m_printerCommandText->SetValue( wxT("lpr") );
+    }
+    else
+    {
+        wxString tmp = wxT("lpr -P");
+        wxListItem item;
+        item.SetColumn( 1 );
+        item.SetMask( wxLIST_MASK_TEXT );
+        item.SetId( event.GetIndex() );
+        m_printerListCtrl->GetItem( item );
+        tmp += item.GetText();
+        m_printerCommandText->SetValue( tmp );
+    }
+}
+
 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());
 
@@ -459,15 +720,34 @@ bool wxGenericPrintSetupDialog::TransferDataToWindow()
         else
             m_orientationRadioBox->SetSelection(1);
     }
         else
             m_orientationRadioBox->SetSelection(1);
     }
-    return TRUE;
+    return true;
 }
 
 bool wxGenericPrintSetupDialog::TransferDataFromWindow()
 {
 }
 
 bool wxGenericPrintSetupDialog::TransferDataFromWindow()
 {
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    // find selected printer
+    long id = m_printerListCtrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+    if (id == 0)
+    {
+        m_printData.SetPrinterName( wxT("") );
+    }
+    else
+    {
+        wxListItem item;
+        item.SetId( id );
+        item.SetMask( wxLIST_MASK_TEXT );
+        item.SetColumn( 1 );
+        m_printerListCtrl->GetItem( item );
+        m_printData.SetPrinterName( item.GetText() );
+    }
+
     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)
@@ -480,32 +760,30 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
     }
     if (m_paperTypeChoice)
     {
     }
     if (m_paperTypeChoice)
     {
-        wxString val(m_paperTypeChoice->GetStringSelection());
-        if (!val.IsNull() && val != "")
-            m_printData.SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(val));
+        int selectedItem = m_paperTypeChoice->GetSelection();
+        if (selectedItem != -1)
+        {
+            wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(selectedItem);
+            if (paper != NULL)
+              m_printData.SetPaperId( paper->GetId());
+        }
     }
 
     }
 
-    // This is for backward compatibility only
-    *wxThePrintSetupData = GetPrintData();
-    return TRUE;
+    if (m_targetData)
+        *m_targetData = m_printData;
+
+    return true;
 }
 
 }
 
-wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice()
 {
 {
-/* Should not be necessary
-    if (!wxThePrintPaperDatabase)
-    {
-        wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-        wxThePrintPaperDatabase->CreateDatabase();
-    }
-*/
-    int n = wxThePrintPaperDatabase->Number();
+    size_t n = wxThePrintPaperDatabase->GetCount();
     wxString *choices = new wxString [n];
     wxString *choices = new wxString [n];
-    int sel = 0;
-    int i;
-    for (i = 0; i < n; i++)
+    size_t sel = 0;
+
+    for (size_t i = 0; i < n; i++)
     {
     {
-        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
+        wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i);
         choices[i] = paper->GetName();
         if (m_printData.GetPaperId() == paper->GetId())
             sel = i;
         choices[i] = paper->GetName();
         if (m_printData.GetPaperId() == paper->GetId())
             sel = i;
@@ -513,159 +791,169 @@ wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 
     int width = 250;
 
 
     int width = 250;
 
-    wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(width, -1), n,
-        choices);
-
-    //    SetFont(thisFont);
+    wxComboBox *choice = new wxComboBox( this,
+                                         wxPRINTID_PAPERSIZE,
+                                         _("Paper Size"),
+                                         wxDefaultPosition,
+                                         wxSize(width, wxDefaultCoord),
+                                         n, choices );
 
     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
 // ----------------------------------------------------------------------------
 
-void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
-{
-    // We no longer query GetPrintMode, so we can eliminate the need
-    // to call SetPrintMode.
-    // This has the limitation that we can't explicitly call the PostScript
-    // print setup dialog from the generic Page Setup dialog under Windows,
-    // but since this choice would only happen when trying to do PostScript
-    // printing under Windows (and only in 16-bit Windows which
-    // doesn't have a Windows-specific page setup dialog) it's worth it.
-
-    // First save the current settings, so the wxPrintData object is up to date.
-    TransferDataFromWindow();
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase)
 
 
-    // Transfer the current print settings from this dialog to the page setup dialog.
-    wxPrintDialogData data;
-    data = GetPageSetupData().GetPrintData();
-    data.SetSetupDialog(TRUE);
-    wxPrintDialog *printDialog = new wxPrintDialog(this, & data);
-    printDialog->ShowModal();
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase)
+    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
+END_EVENT_TABLE()
 
 
-    // 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().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();
-}
-
-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,
+                                                    wxPageSetupDialogData* data)
+    : wxPageSetupDialogBase( parent,
+                wxID_ANY,
+                _("Page Setup"),
+                wxPoint(0, 0),
+                wxSize(600, 600),
+                wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
 {
 {
-    if ( data )
+    if (data)
         m_pageData = *data;
 
         m_pageData = *data;
 
-    int buttonWidth = 75;
-    int buttonHeight = 25;
-    int spacing = 5;
-#ifdef __WXMOTIF__
-    spacing = 15;
-#endif
-
-    int yPos = 5;
-    int xPos = 5;
-
-    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(5, yPos), wxSize(buttonWidth, buttonHeight));
-    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(buttonWidth + 5 + spacing, yPos), wxSize(buttonWidth, buttonHeight));
-
-    m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight));
+    int textWidth = 80;
 
 
-    if ( !m_pageData.GetEnablePrinter() )
-        m_printerButton->Enable(FALSE);
+    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 
 
-    //  if (m_printData.GetEnableHelp())
-    //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), -1, -1, buttonWidth, buttonHeight);
+    // 1) top
+    wxStaticBoxSizer *topsizer = new wxStaticBoxSizer(
+      new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL );
 
 
-    okButton->SetDefault();
-    okButton->SetFocus();
+    size_t      n = wxThePrintPaperDatabase->GetCount();
+    wxString   *choices = new wxString [n];
 
 
-    xPos = 5;
-    yPos += 35;
+    for (size_t i = 0; i < n; i++)
+    {
+        wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i);
+        choices[i] = paper->GetName();
+    }
 
 
-#ifdef __WXMOTIF__
-    yPos += 10;
-#endif
+    m_paperTypeChoice = new wxComboBox( this,
+                                        wxPRINTID_PAPERSIZE,
+                                        _("Paper Size"),
+                                        wxDefaultPosition,
+                                        wxSize(300, wxDefaultCoord),
+                                        n, choices );
+    topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
+//  m_paperTypeChoice->SetSelection(sel);
 
 
-    m_paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
+    mainsizer->Add( topsizer, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
 
 
-    xPos = 5;
+    // 2) middle sizer with radio box
 
 
-    wxString *choices = new wxString[2];
-    choices[0] = _("Portrait");
-    choices[1] = _("Landscape");
+    wxString *choices2 = new wxString[2];
+    choices2[0] = _("Portrait");
+    choices2[1] = _("Landscape");
     m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
     m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
-        wxPoint(xPos, yPos), wxSize(-1, -1), 2, choices, 2);
+        wxDefaultPosition, wxDefaultSize, 2, choices2, 2);
     m_orientationRadioBox->SetSelection(0);
 
     m_orientationRadioBox->SetSelection(0);
 
-    xPos = 5;
-    yPos += 60;
+    mainsizer->Add( m_orientationRadioBox, 0, wxTOP|wxLEFT|wxRIGHT, 10 );
 
 
-    int staticWidth = 110;
-#ifdef __WXMOTIF__
-    staticWidth += 20;
-#endif
+    // 3) margins
 
 
-    int textWidth = 60;
-    spacing = 10;
+    wxBoxSizer *table = new wxBoxSizer( wxHORIZONTAL );
 
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Left margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
+    wxBoxSizer *column1 = new wxBoxSizer( wxVERTICAL );
+    column1->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Left margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 );
+    column1->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Top margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 );
+    table->Add( column1, 0, wxALL | wxEXPAND, 5 );
 
 
-    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    xPos += textWidth + spacing;
+    wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );
+    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+    column2->Add( m_marginLeftText, 1, wxALL, 5 );
+    column2->Add( m_marginTopText, 1, wxALL, 5 );
+    table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
 
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Right margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
+    wxBoxSizer *column3 = new wxBoxSizer( wxVERTICAL );
+    column3->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Right margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 );
+    column3->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Bottom margin (mm):")),1,wxALL|wxALIGN_RIGHT,5 );
+    table->Add( column3, 0, wxALL | wxEXPAND, 5 );
 
 
-    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    xPos += textWidth + spacing;
+    wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );
+    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+    column4->Add( m_marginRightText, 1, wxALL, 5 );
+    column4->Add( m_marginBottomText, 1, wxALL, 5 );
+    table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
 
 
-    yPos += 35;
-    xPos = 5;
+    mainsizer->Add( table, 0 );
 
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Top margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
+#if wxUSE_STATLINE
+    // 5) static line
+    mainsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
 
 
-    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    xPos += textWidth + spacing;
+    // 6) buttons
 
 
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Bottom margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
+    wxSizer* buttonsizer = CreateButtonSizer( wxOK|wxCANCEL);
+    
+    if (wxPrintFactory::GetFactory()->HasPrintSetupDialog())
+    {
+        m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") );
+        buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 );
+        if ( !m_pageData.GetEnablePrinter() )
+            m_printerButton->Enable(false);
+    }
+    else
+    {
+        m_printerButton = NULL;
+    }
+        
+    //  if (m_printData.GetEnableHelp())
+    //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight);
+    mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
 
 
-    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
 
 
-    Fit();
+    SetAutoLayout( true );
+    SetSizer( mainsizer );
+
+    mainsizer->Fit( this );
     Centre(wxBOTH);
 
     InitDialog();
     Centre(wxBOTH);
 
     InitDialog();
-    delete [] choices;
+
+    delete[] choices;
+    delete [] choices2;
 }
 
 wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
 {
 }
 
 }
 
 wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
 {
 }
 
+wxPageSetupDialogData& wxGenericPageSetupDialog::GetPageSetupDialogData()
+{ 
+    return m_pageData;
+}
+
 bool wxGenericPageSetupDialog::TransferDataToWindow()
 {
     if (m_marginLeftText)
 bool wxGenericPageSetupDialog::TransferDataToWindow()
 {
     if (m_marginLeftText)
-        m_marginLeftText->SetValue(IntToString((int) 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((int) 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((int) 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((int) m_pageData.GetMarginBottomRight().y));
+        m_marginBottomText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().y));
 
     if (m_orientationRadioBox)
     {
 
     if (m_orientationRadioBox)
     {
@@ -689,40 +977,43 @@ bool wxGenericPageSetupDialog::TransferDataToWindow()
         m_paperTypeChoice->SetStringSelection(type->GetName());
     }
 
         m_paperTypeChoice->SetStringSelection(type->GetName());
     }
 
-    return TRUE;
+    return true;
 }
 
 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)
     {
     if (m_paperTypeChoice)
     {
-        wxString val(m_paperTypeChoice->GetStringSelection());
-        if (!val.IsNull() && val != "")
+        int selectedItem = m_paperTypeChoice->GetSelection();
+        if (selectedItem != -1)
         {
         {
-            wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(val);
+            wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(selectedItem);
             if ( paper )
             {
                 m_pageData.SetPaperSize(wxSize(paper->GetWidth()/10, paper->GetHeight()/10));
             if ( paper )
             {
                 m_pageData.SetPaperSize(wxSize(paper->GetWidth()/10, paper->GetHeight()/10));
@@ -731,10 +1022,10 @@ bool wxGenericPageSetupDialog::TransferDataFromWindow()
         }
     }
 
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 }
 
-wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 {
 /*
     if (!wxThePrintPaperDatabase)
 {
 /*
     if (!wxThePrintPaperDatabase)
@@ -744,20 +1035,24 @@ wxChoice *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 = wxThePrintPaperDatabase->Item(i);
         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;
 
-    wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(300, -1), n,
-        choices);
+    wxComboBox *choice = new wxComboBox( this,
+                                         wxPRINTID_PAPERSIZE,
+                                         _("Paper Size"),
+                                         wxPoint(*x, *y),
+                                         wxSize(300, wxDefaultCoord),
+                                         n, choices );
     *y += 35;
     delete[] choices;
 
     *y += 35;
     delete[] choices;
 
@@ -765,3 +1060,39 @@ wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
     return choice;
 }
 
     return choice;
 }
 
+void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
+{
+    // We no longer query GetPrintMode, so we can eliminate the need
+    // to call SetPrintMode.
+    // This has the limitation that we can't explicitly call the PostScript
+    // print setup dialog from the generic Page Setup dialog under Windows,
+    // but since this choice would only happen when trying to do PostScript
+    // printing under Windows (and only in 16-bit Windows which
+    // doesn't have a Windows-specific page setup dialog) it's worth it.
+
+    // First save the current settings, so the wxPrintData object is up to date.
+    TransferDataFromWindow();
+
+    // Transfer the current print settings from this dialog to the page setup dialog.
+    
+#if 0
+    // Use print factory later    
+    
+    wxPrintDialogData data;
+    data = GetPageSetupData().GetPrintData();
+    data.SetSetupDialog(true);
+    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.
+    GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData();
+    GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData
+
+    // Now update the dialog in case the page setup dialog changed some of our settings.
+    TransferDataToWindow();
+#endif
+}
+
+#endif
+
wxWidgets (Impactor)