unreachable code warning fix (Unicode build)

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 42a2299da47a96f46dd158c9b50fd2bdb6e26be2..a9784b3905f4219ba12143750a77aebba542877e 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -60,9 +60,8 @@
 #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 "wx/tokenzr.h"
+#include "wx/imaglist.h"

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


@@ -83,7 +82,7 @@ IMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase)
 
 wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
 {
 
 wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
 {

-    m_previewCommand = wxT("");
+    m_previewCommand = wxEmptyString;

 #ifdef __VMS__
     m_printerCommand = wxT("print");
     m_printerOptions = wxT("/nonotify/queue=psqueue");
 #ifdef __VMS__
     m_printerCommand = wxT("print");
     m_printerOptions = wxT("/nonotify/queue=psqueue");


@@ -92,33 +91,32 @@ wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
 
 #ifdef __WXMSW__
     m_printerCommand = wxT("print");
 
 #ifdef __WXMSW__
     m_printerCommand = wxT("print");

-    m_printerOptions = wxT("");
+    m_printerOptions = wxEmptyString;

     m_afmPath = wxT("c:\\windows\\system\\");
 #endif
 
 #if !defined(__VMS__) && !defined(__WXMSW__)
     m_printerCommand = wxT("lpr");
     m_afmPath = wxT("c:\\windows\\system\\");
 #endif
 
 #if !defined(__VMS__) && !defined(__WXMSW__)
     m_printerCommand = wxT("lpr");

-    m_printerOptions = wxT("");
-    m_afmPath = wxT("");
+    m_printerOptions = wxEmptyString;
+    m_afmPath = wxEmptyString;

 #endif
 
     m_printerScaleX = 1.0;
     m_printerScaleY = 1.0;
     m_printerTranslateX = 0;
     m_printerTranslateY = 0;
 #endif
 
     m_printerScaleX = 1.0;
     m_printerScaleY = 1.0;
     m_printerTranslateX = 0;
     m_printerTranslateY = 0;

-    m_printMode = wxPRINT_MODE_FILE;

 }
 
 wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData()
 {
 }
 
 }
 
 wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData()
 {
 }
 

-bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &data )
+bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &WXUNUSED(data) )

 {
     return true;
 }
 
 {
     return true;
 }
 

-bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &data )
+bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &WXUNUSED(data) )

 {
     return true;
 }
 {
     return true;
 }


@@ -138,7 +136,7 @@ END_EVENT_TABLE()
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
                     : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
                     : wxPrintDialogBase(parent, wxID_ANY, _("Print"),

-                               wxPoint(0, 0), wxSize(600, 600),
+                               wxPoint(0,0), wxSize(600, 600),

                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
 {
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
 {


@@ -151,7 +149,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
                     : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
                     : wxPrintDialogBase(parent, wxID_ANY, _("Print"),

-                               wxPoint(0, 0), wxSize(600, 600),
+                               wxPoint(0,0), wxSize(600, 600),

                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
 {
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
 {


@@ -163,24 +161,47 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 {
 
 void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 {

-  //    wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0, 0), wxSize(600, 600),
+  //    wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0,0), wxSize(600, 600),

   //                     wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) top row
 
   //                     wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 
     // 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 );

-    m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") );
-    topsizer->Add( m_printToFileCheckBox, 0, wxCENTER|wxALL, 5 );
+    wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
+    flex->AddGrowableCol( 1 );
+    topsizer->Add( flex, 1, wxGROW );

 
 

-    topsizer->Add( 60,2,1 );
+    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...") );
 
     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, wxID_ANY, _("Printer:") ),
+            0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+        flex->Add( new wxStaticText( this, wxID_ANY, factory->CreatePrinterLine() ),
+            0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    }
+
+    if (factory->HasStatusLine())
+    {
+        flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
+            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+        flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
+            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+    }

 
 

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

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


@@ -231,7 +252,7 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 
     // 5) buttons
 
 
     // 5) buttons
 

-    mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
+    mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|wxALL, 10 );

 
     SetAutoLayout( true );
     SetSizer( mainsizer );
 
     SetAutoLayout( true );
     SetSizer( mainsizer );


@@ -246,31 +267,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( 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();
-        }
-
-        // 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()


@@ -286,28 +283,25 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     if (m_printDialogData.GetToPage() < 1)
         m_printDialogData.SetToPage(m_printDialogData.GetFromPage());
 
     if (m_printDialogData.GetToPage() < 1)
         m_printDialogData.SetToPage(m_printDialogData.GetFromPage());
 

-    wxPostScriptPrintNativeData *data = 
-        (wxPostScriptPrintNativeData *) m_printDialogData.GetPrintData().GetNativeData();
-

     // 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
     // or not.
     if (m_printDialogData.GetPrintToFile())
     {
     // 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
     // or not.
     if (m_printDialogData.GetPrintToFile())
     {

-        data->SetPrintMode(wxPRINT_MODE_FILE);
+        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);

 
         wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
 
         wxFileDialog dialog( this, _("PostScript file"),
 
         wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
 
         wxFileDialog dialog( this, _("PostScript file"),

-            fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
+            fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxSAVE | wxOVERWRITE_PROMPT );

         if (dialog.ShowModal() != wxID_OK) return;
         if (dialog.ShowModal() != wxID_OK) return;

-        
+

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

-        data->SetPrintMode(wxPRINT_MODE_PRINTER);
+        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);

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


@@ -331,10 +325,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();

     }
 }
 
     }
 }
 


@@ -400,10 +399,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


@@ -421,15 +426,9 @@ 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());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -438,73 +437,273 @@ wxDC *wxGenericPrintDialog::GetPrintDC()
 
 IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
 
 
 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, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
+wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)

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

+/* 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.       ",
+"       .        ",
+"                ",
+"                "
+};
+
+

 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

 
 

-    wxString *choices =  new wxString[2];
-    choices[0] = _("Portrait");
-    choices[1] = _("Landscape");
+    wxStaticBoxSizer *printer_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Printer") ), wxVERTICAL );
+    main_sizer->Add( printer_sizer, 0, wxALL|wxGROW, 10 );

 
 

-    m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
-        wxPoint(10, 80), wxDefaultSize, 2, choices, 1, wxRA_VERTICAL );
-    m_orientationRadioBox->SetSelection(0);
+    m_printerListCtrl = new wxListCtrl( this, wxPRINTID_PRINTER,
+        wxDefaultPosition, wxSize(wxDefaultCoord,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 );

 
 

-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(staticBoxWidth, 50) );
+    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 );

 
 

-    int colourYPos = 145;
+    wxListItem item;
+    item.SetMask( wxLIST_MASK_TEXT );
+    item.SetColumn( 1 );
+    item.SetText( _("Default printer") );
+    item.SetId( m_printerListCtrl->InsertItem( item ) );

 
 

-#ifdef __WXMOTIF__
-    colourYPos = 150;
-#endif
+    if (data->GetPrinterName().empty())
+    {
+        wxListItem item2;
+        item2.SetId( item.GetId() );
+        item2.SetMask( wxLIST_MASK_IMAGE );
+        item2.SetImage( 0 );
+        m_printerListCtrl->SetItem( item2 );
+    }

 
 

-    m_colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourYPos));
+    item.SetId( 1+ item.GetId() );

 
 

-    (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(330, 10), wxSize(200,170) );
+    wxArrayString errors;
+    wxArrayString output;
+    long res = wxExecute( wxT("lpstat -v"), output, errors, wxEXEC_NODISABLE );
+    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 );
+            }

 
 

-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
+            wxString command = wxT("lpstat -p ");
+            command += name;
+            wxArrayString errors2;
+            wxArrayString output2;
+            res = wxExecute( command, output2, errors2, wxEXEC_NODISABLE );
+            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 != wxNOT_FOUND)
+                    tmp.Remove( (size_t)pos, tmp.Len()-(size_t)pos );
+                wxStringTokenizer tok2( tmp, wxT(" ") );
+                tmp = tok2.GetNextToken();  // "printer"
+                tmp = tok2.GetNextToken();  // "hp_deskjet930c"
+                tmp = wxEmptyString;
+                while (tok2.HasMoreTokens())
+                {
+                    tmp += tok2.GetNextToken();
+                    tmp += wxT(" ");
+                }
+                item.SetColumn( 3 );
+                item.SetText( tmp );
+                m_printerListCtrl->SetItem( item );
+            }

 
 

-    m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxEmptyString, wxPoint(360, 55), wxSize(150, wxDefaultCoord));
+            item.SetColumn( 1 );
+            item.SetId( 1+ item.GetId() );
+        }
+    }
+
+
+    printer_sizer->Add( m_printerListCtrl, 0, wxALL|wxGROW, 5 );
+
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+    main_sizer->Add( item1, 0, wxALL, 5 );
+
+    // 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, wxID_ANY, _("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 );
+
+    item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item1->Add( item2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    // spooling options (on the right)
+
+    wxStaticBox *item11 = new wxStaticBox( this, wxID_ANY, _("Print spooling") );
+    wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL );
+
+    wxStaticText *item12 = new wxStaticText( this, wxID_ANY, _("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, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
+    item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 );

 
 

-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
+    wxStaticText *item15 = new wxStaticText( this, wxID_ANY, _("Printer options:") );
+    item10->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

 
 

-    m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxEmptyString, wxPoint(360, 135), wxSize(150, wxDefaultCoord));
+    wxBoxSizer *item16 = new wxBoxSizer( wxHORIZONTAL );

 
 

-    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));
+    item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
+    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, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
+
+    // buttons
+
+    main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|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()
 {

-    wxPostScriptPrintNativeData *data = 
+    wxPostScriptPrintNativeData *data =

         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 
     if (m_printerCommandText && data->GetPrinterCommand())
         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 
     if (m_printerCommandText && data->GetPrinterCommand())


@@ -526,9 +725,25 @@ bool wxGenericPrintSetupDialog::TransferDataToWindow()
 
 bool wxGenericPrintSetupDialog::TransferDataFromWindow()
 {
 
 bool wxGenericPrintSetupDialog::TransferDataFromWindow()
 {

-    wxPostScriptPrintNativeData *data = 
+    wxPostScriptPrintNativeData *data =

         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 
         (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( wxEmptyString );
+    }
+    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)
         data->SetPrinterCommand(m_printerCommandText->GetValue());
     if (m_printerOptionsText)
     if (m_printerCommandText)
         data->SetPrinterCommand(m_printerCommandText->GetValue());
     if (m_printerOptionsText)


@@ -554,21 +769,17 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
         }
     }
 
         }
     }
 

+    if (m_targetData)
+        *m_targetData = m_printData;
+

     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++)
     {


@@ -583,64 +794,34 @@ 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)
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase)

 
 

-BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase)

     EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
 END_EVENT_TABLE()
 
     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
-    // 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.
-    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();
-}
-

 wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
 wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,

-                                                    wxPageSetupData* data)
-    : wxDialog( parent,
+                                                    wxPageSetupDialogData* data)
+    : wxPageSetupDialogBase( parent,

                 wxID_ANY,
                 _("Page Setup"),
                 wxID_ANY,
                 _("Page Setup"),

-                wxPoint(0, 0),
+                wxPoint(0,0),

                 wxSize(600, 600),
                 wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
 {
                 wxSize(600, 600),
                 wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
 {


@@ -724,13 +905,22 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
     // 6) buttons
 
     wxSizer* buttonsizer = CreateButtonSizer( wxOK|wxCANCEL);
     // 6) buttons
 
     wxSizer* buttonsizer = CreateButtonSizer( wxOK|wxCANCEL);

-    m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") );
-    buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 );
-    if ( !m_pageData.GetEnablePrinter() )
-        m_printerButton->Enable(false);
+
+    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);
     //  if (m_printData.GetEnableHelp())
     //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight);

-    mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
+    mainsizer->Add( buttonsizer, 0, wxEXPAND|wxALL, 10 );

 
 
     SetAutoLayout( true );
 
 
     SetAutoLayout( true );


@@ -749,6 +939,11 @@ wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
 {
 }
 
 {
 }
 

+wxPageSetupDialogData& wxGenericPageSetupDialog::GetPageSetupDialogData()
+{
+    return m_pageData;
+}
+

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


@@ -865,5 +1060,39 @@ wxComboBox *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
 
 #endif