fix for toolbar radio buttons event generation

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 688edb11da2736849a2b331a15ea85ba36980536..28d12521593b7ac6950e3c2c2d0d4813fe25ea51 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -6,42 +6,56 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "prntdlgg.h"
+    #pragma implementation "prntdlgg.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
+#if wxUSE_PRINTING_ARCHITECTURE

 
 #ifndef WX_PRECOMP
 
 #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/checkbox.h"
-#include "wx/textctrl.h"
-#include "wx/radiobox.h"
-#include "wx/filedlg.h"
-#include "wx/choice.h"
-#include <wx/intl.h>
+    #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/checkbox.h"
+    #include "wx/textctrl.h"
+    #include "wx/radiobox.h"
+    #include "wx/filedlg.h"
+    #include "wx/choice.h"
+    #include "wx/combobox.h"
+    #include "wx/intl.h"
+    #include "wx/sizer.h"
+#endif
+
+#if wxUSE_STATLINE
+  #include "wx/statline.h"

 #endif
 
 #include "wx/generic/prntdlgg.h"
 
 #if wxUSE_POSTSCRIPT
 #endif
 
 #include "wx/generic/prntdlgg.h"
 
 #if wxUSE_POSTSCRIPT

-#include "wx/generic/dcpsg.h"
+    #include "wx/generic/dcpsg.h"

 #endif
 
 #include "wx/printdlg.h"
 #endif
 
 #include "wx/printdlg.h"


@@ -53,79 +67,151 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#if wxUSE_POSTSCRIPT
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
-IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
-IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+#if wxUSE_POSTSCRIPT

 
 

-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(wxGenericPrintDialog, wxDialog)
+    IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)

 
 

-BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
-EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
-END_EVENT_TABLE()
+    BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
+        EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
+        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
+        EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
+    END_EVENT_TABLE()

 #endif
 
 #endif
 

+    IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+
+    BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+        EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
+    END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// global vars
+// ----------------------------------------------------------------------------
+

 extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 
 extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 

-/*
-* Generic print dialog for non-Windows printing use.
-*/
+#if wxUSE_POSTSCRIPT

 
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Generic print dialog for non-Windows printing use.
+// ----------------------------------------------------------------------------
+
+wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
+                                           wxPrintDialogData* data)
+                    : wxDialog(parent, -1, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxDIALOG_MODAL |
+                               wxTAB_TRAVERSAL)
+{
+    if ( data )
+        m_printDialogData = *data;

 
 

-wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintDialogData* data):
-wxDialog(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
+    Init(parent);
+}
+
+wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
+                                           wxPrintData* data)
+                    : wxDialog(parent, -1, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxDIALOG_MODAL |
+                               wxTAB_TRAVERSAL)

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

+
+    Init(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);
+
+    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
+
+    // 1) top row 
+        
+    wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( 
+        new wxStaticBox( this, -1, _( "Printer options" ) ), wxHORIZONTAL );
+    m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") );
+    topsizer->Add( m_printToFileCheckBox, 0, wxCENTER|wxALL, 5 );
+
+    topsizer->Add( 60,2,1 );
+
+    m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );
+    topsizer->Add( m_setupButton, 0, wxCENTER|wxALL, 5 );

     
     

-    (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
-    
-    m_printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(20, 25) );
+    mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT, 10 );

     
     

-    m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(160, 25), wxSize(100, -1));
+    // 2) middle row with radio box

     
     wxString *choices = new wxString[2];
     choices[0] = _("All");
     choices[1] = _("Pages");
     
     wxString *choices = new wxString[2];
     choices[0] = _("All");
     choices[1] = _("Pages");

-    
+

     m_fromText = (wxTextCtrl*)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), 2, choices, 1, wxRA_VERTICAL);
+                                         wxDefaultPosition, wxDefaultSize,
+                                         2, choices,
+                                         1, wxRA_VERTICAL);

         m_rangeRadioBox->SetSelection(1);
         m_rangeRadioBox->SetSelection(1);

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

     }
     }

+
+    // 3) bottom row

     
     

-    if(m_printDialogData.GetFromPage() != 0)
+    wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
+
+    if (m_printDialogData.GetFromPage() != 0)

     {
     {

-        (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(5, 135));
-        
-        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(45, 130), wxSize(40, -1));
-        
-        (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(100, 135));
-        
-        m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(133, 130), wxSize(40, -1));
+        bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
+        m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxDefaultPosition, wxSize(40, -1));
+       bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
+
+        bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
+        m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxDefaultPosition, wxSize(40, -1));
+       bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );

     }
     }

-    
-    (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, "", wxPoint(252, 130), wxSize(40, -1));
     m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1));

-    
-    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));
-    
-    okButton->SetDefault();
-    okButton->SetFocus();
-    Fit();
+    bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
+
+    mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
+
+#if wxUSE_STATLINE
+    // 4) static line
+    mainsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
+
+    // 5) buttons
+
+    mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
+
+    SetAutoLayout( TRUE );
+    SetSizer( mainsizer );
+
+    mainsizer->Fit( this );

     Centre(wxBOTH);
     Centre(wxBOTH);

-    
+

     // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
     InitDialog();
     delete[] choices;
     // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
     InitDialog();
     delete[] choices;


@@ -171,7 +257,7 @@ wxGenericPrintDialog::~wxGenericPrintDialog()
 void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     TransferDataFromWindow();
 void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     TransferDataFromWindow();

-    
+

     // 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


@@ -180,27 +266,30 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_FILE);
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_FILE);

-        
+

         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),

-            "ps", "*.ps", 0, this);
+            wxT("ps"), wxT("*.ps"), 0, this);

         if ( f.IsEmpty() )
             return;
         if ( f.IsEmpty() )
             return;

-        
+

         m_printDialogData.GetPrintData().SetFilename(f);
         wxThePrintSetupData->SetPrinterFile(f);
     }
     else
         m_printDialogData.GetPrintData().SetFilename(f);
         wxThePrintSetupData->SetPrinterFile(f);
     }
     else

+    {
+        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);

         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);
         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);

-    
+    }
+

     EndModal(wxID_OK);
 }
 
 void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 {
     if (!m_fromText) return;
     EndModal(wxID_OK);
 }
 
 void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 {
     if (!m_fromText) return;

-    
+

     if (event.GetInt() == 0)
     {
         m_fromText->Enable(FALSE);
     if (event.GetInt() == 0)
     {
         m_fromText->Enable(FALSE);


@@ -215,6 +304,7 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {

+   *wxThePrintSetupData = m_printDialogData.GetPrintData();

     wxGenericPrintSetupDialog *genericPrintSetupDialog =
         new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
     int ret = genericPrintSetupDialog->ShowModal();
     wxGenericPrintSetupDialog *genericPrintSetupDialog =
         new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
     int ret = genericPrintSetupDialog->ShowModal();


@@ -223,42 +313,47 @@ void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
         *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
         m_printDialogData = genericPrintSetupDialog->GetPrintData();
     }
         *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
         m_printDialogData = genericPrintSetupDialog->GetPrintData();
     }

-    
+

     genericPrintSetupDialog->Close(TRUE);
 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {
     char buf[10];
     genericPrintSetupDialog->Close(TRUE);
 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 {
     char buf[10];

-    
+

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

-        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);
-            
-            if (m_printDialogData.GetAllPages())
+       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);
+             if(m_rangeRadioBox)
+                if (m_printDialogData.GetAllPages())
+                   m_rangeRadioBox->SetSelection(0);
+                else
+                   m_rangeRadioBox->SetSelection(1);
+          }
+          else
+          {
+             m_fromText->Enable(FALSE);
+             m_toText->Enable(FALSE);
+             if(m_rangeRadioBox)
+             {

                 m_rangeRadioBox->SetSelection(0);
                 m_rangeRadioBox->SetSelection(0);

-            else
-                m_rangeRadioBox->SetSelection(1);
-        }
-        else
-        {
-            m_fromText->Enable(FALSE);
-            m_toText->Enable(FALSE);
-            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);
     }
     sprintf(buf, "%d", m_printDialogData.GetNoCopies());
     m_noCopiesText->SetValue(buf);

-    
+

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


@@ -270,20 +365,23 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
     {
         if (m_printDialogData.GetEnablePageNumbers())
         {
     {
         if (m_printDialogData.GetEnablePageNumbers())
         {

-            m_printDialogData.SetFromPage(atoi(m_fromText->GetValue()));
-            m_printDialogData.SetToPage(atoi(m_toText->GetValue()));
+           if(m_fromText) m_printDialogData.SetFromPage(wxAtoi(m_fromText->GetValue()));
+           if(m_toText)   m_printDialogData.SetToPage(wxAtoi(m_toText->GetValue()));
+        }
+        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);
-        else
-            m_printDialogData.SetAllPages(FALSE);

     }
     else
     { // continuous printing
         m_printDialogData.SetFromPage(1);
         m_printDialogData.SetToPage(32000);
     }
     }
     else
     { // continuous printing
         m_printDialogData.SetFromPage(1);
         m_printDialogData.SetToPage(32000);
     }

-    m_printDialogData.SetNoCopies(atoi(m_noCopiesText->GetValue()));
+    m_printDialogData.SetNoCopies(wxAtoi(m_noCopiesText->GetValue()));

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


@@ -296,12 +394,13 @@ TODO: collate and noCopies should be duplicated across dialog data and print dat
 
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {
 
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {

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

 }
 
 }
 

-/*
-* Generic print setup dialog
-*/
+// ----------------------------------------------------------------------------
+// Generic print setup dialog
+// ----------------------------------------------------------------------------

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


@@ -328,50 +427,50 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
         m_printData = *data;
 
     int staticBoxWidth = 300;
         m_printData = *data;
 
     int staticBoxWidth = 300;

-    
+

     (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(10, 10), wxSize(staticBoxWidth, 60) );
     (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(10, 10), wxSize(staticBoxWidth, 60) );

-    
+

     int xPos = 20;
     int yPos = 30;
     m_paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
     int xPos = 20;
     int yPos = 30;
     m_paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);

-    
+

     wxString *choices =  new wxString[2];
     choices[0] = _("Portrait");
     choices[1] = _("Landscape");
     wxString *choices =  new wxString[2];
     choices[0] = _("Portrait");
     choices[1] = _("Landscape");

-    
+

     m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
         wxPoint(10, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL );
     m_orientationRadioBox->SetSelection(0);
     m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
         wxPoint(10, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL );
     m_orientationRadioBox->SetSelection(0);

-    
+

     (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(staticBoxWidth, 50) );
     (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(staticBoxWidth, 50) );

-    
+

     int colourYPos = 145;
     int colourYPos = 145;

-    
+

 #ifdef __WXMOTIF__
     colourYPos = 150;
 #endif
 #ifdef __WXMOTIF__
     colourYPos = 150;
 #endif

-    
+

     m_colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourYPos));
 
     (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(330, 10), wxSize(200,170) );
     m_colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourYPos));
 
     (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(330, 10), wxSize(200,170) );

-    
+

     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));

-    
+

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

-    
+

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

-    
+

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

-    
-    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));
-    
+
+    wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(80, -1));
+    (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(320, 200), wxSize(80, -1));
+

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

-    
+

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

-    
+

     InitDialog();
     delete[] choices;
 }
     InitDialog();
     delete[] choices;
 }


@@ -388,7 +487,7 @@ bool wxGenericPrintSetupDialog::TransferDataToWindow()
         m_printerOptionsText->SetValue(m_printData.GetPrinterOptions());
     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());
         m_printerOptionsText->SetValue(m_printData.GetPrinterOptions());
     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());

-    
+

     if (m_orientationRadioBox)
     {
         if (m_printData.GetOrientation() == wxPORTRAIT)
     if (m_orientationRadioBox)
     {
         if (m_printData.GetOrientation() == wxPORTRAIT)


@@ -427,7 +526,7 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 /* Should not be necessary
     if (!wxThePrintPaperDatabase)
 {
 /* Should not be necessary
     if (!wxThePrintPaperDatabase)


@@ -447,25 +546,26 @@ wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
         if (m_printData.GetPaperId() == paper->GetId())
             sel = i;
     }
         if (m_printData.GetPaperId() == paper->GetId())
             sel = i;
     }

-    
+

     int width = 250;
 
     int width = 250;
 

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

         choices);
 
     //    SetFont(thisFont);
 
     delete[] choices;
         choices);
 
     //    SetFont(thisFont);
 
     delete[] choices;

-    
+

     choice->SetSelection(sel);
     return choice;
 }
     choice->SetSelection(sel);
     return choice;
 }

-#endif
-// wxUSE_POSTSCRIPT
+#endif // wxUSE_POSTSCRIPT

 
 

-/*
- * Generic page setup dialog
- */
+// ----------------------------------------------------------------------------
+// Generic page setup dialog
+// ----------------------------------------------------------------------------

 
 void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
 {


@@ -501,93 +601,101 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
 wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data):
 wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
 {
 wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data):
 wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
 {

-    if ( data )
+    if (data)

         m_pageData = *data;
         m_pageData = *data;

+       
+    int textWidth = 80;
+       
+    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );

     
     

-    int buttonWidth = 75;
-    int buttonHeight = 25;
-    int spacing = 5;
-#ifdef __WXMOTIF__
-    spacing = 15;
-#endif
+    // 1) top
+    wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( 
+      new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL );

     
     

-    int yPos = 5;
-    int xPos = 5;
+    int n = wxThePrintPaperDatabase->Number();
+    wxString *choices = new wxString [n];
+    int i;
+    for (i = 0; i < n; i++)
+    {
+        wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
+        choices[i] = paper->GetName();
+    }
+
+    m_paperTypeChoice = new wxComboBox(this, wxPRINTID_PAPERSIZE, _("Paper Size"),
+                                        wxDefaultPosition, wxSize(300, -1), n, choices);
+    topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
+//  m_paperTypeChoice->SetSelection(sel);
+
+    mainsizer->Add( topsizer, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
+
+    // 2) middle sizer with radio box
+
+    wxString *choices2 = new wxString[2];
+    choices2[0] = _("Portrait");
+    choices2[1] = _("Landscape");
+    m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
+        wxDefaultPosition, wxDefaultSize, 2, choices2, 2);
+    m_orientationRadioBox->SetSelection(0);
+
+    mainsizer->Add( m_orientationRadioBox, 0, wxTOP|wxLEFT|wxRIGHT, 10 );
+
+    // 3) margins
+
+    wxBoxSizer *table = new wxBoxSizer( wxHORIZONTAL );
+
+    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 );
+    
+    wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );
+    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
+    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
+    column2->Add( m_marginLeftText, 1, wxALL, 5 );
+    column2->Add( m_marginTopText, 1, wxALL, 5 );
+    table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 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));
+    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_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight));
+    wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );
+    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
+    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, "", wxDefaultPosition, wxSize(textWidth, -1));
+    column4->Add( m_marginRightText, 1, wxALL, 5 );
+    column4->Add( m_marginBottomText, 1, wxALL, 5 );
+    table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
+
+    mainsizer->Add( table, 0 );
+
+#if wxUSE_STATLINE
+    // 5) static line
+    mainsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
+
+    // 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 ( !m_pageData.GetEnablePrinter() )
         m_printerButton->Enable(FALSE);

-    

     //  if (m_printData.GetEnableHelp())
     //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), -1, -1, buttonWidth, buttonHeight);
     //  if (m_printData.GetEnableHelp())
     //  wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), -1, -1, buttonWidth, buttonHeight);

-    
-    okButton->SetDefault();
-    okButton->SetFocus();
-    
-    xPos = 5;
-    yPos += 35;
-    
-#ifdef __WXMOTIF__
-    yPos += 10;
-#endif
-    
-    m_paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
-    
-    xPos = 5;
-    
-    wxString *choices = new wxString[2];
-    choices[0] = _("Portrait");
-    choices[1] = _("Landscape");
-    m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
-        wxPoint(xPos, yPos), wxSize(-1, -1), 2, choices, 2);
-    m_orientationRadioBox->SetSelection(0);
-    
-    xPos = 5;
-    yPos += 60;
-    
-    int staticWidth = 110;
-#ifdef __WXMOTIF__
-    staticWidth += 20;
-#endif
-    
-    int textWidth = 60;
-    spacing = 10;
-    
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Left margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
-    
-    m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    xPos += textWidth + spacing;
-    
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Right margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
-    
-    m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    xPos += textWidth + spacing;
-    
-    yPos += 35;
-    xPos = 5;
-    
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Top margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
-    
-    m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    xPos += textWidth + spacing;
-    
-    (void) new wxStaticText(this, wxPRINTID_STATIC, _("Bottom margin (mm):"), wxPoint(xPos, yPos));
-    xPos += staticWidth;
-    
-    m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
-    
-    Fit();
+    mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
+
+
+    SetAutoLayout( TRUE );
+    SetSizer( mainsizer );
+
+    mainsizer->Fit( this );

     Centre(wxBOTH);
     Centre(wxBOTH);

-    
+

     InitDialog();
     InitDialog();

-    delete [] choices;
+    
+    delete[] choices;
+    delete [] choices2;

 }
 
 wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
 }
 
 wxGenericPageSetupDialog::~wxGenericPageSetupDialog()


@@ -604,7 +712,7 @@ bool wxGenericPageSetupDialog::TransferDataToWindow()
         m_marginRightText->SetValue(IntToString((int) m_pageData.GetMarginBottomRight().x));
     if (m_marginBottomText)
         m_marginBottomText->SetValue(IntToString((int) m_pageData.GetMarginBottomRight().y));
         m_marginRightText->SetValue(IntToString((int) m_pageData.GetMarginBottomRight().x));
     if (m_marginBottomText)
         m_marginBottomText->SetValue(IntToString((int) m_pageData.GetMarginBottomRight().y));

-    
+

     if (m_orientationRadioBox)
     {
         if (m_pageData.GetPrintData().GetOrientation() == wxPORTRAIT)
     if (m_orientationRadioBox)
     {
         if (m_pageData.GetPrintData().GetOrientation() == wxPORTRAIT)


@@ -633,10 +741,10 @@ bool wxGenericPageSetupDialog::TransferDataToWindow()
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)

-        m_pageData.SetMarginTopLeft(wxPoint(atoi((const char *)m_marginLeftText->GetValue()),atoi((const char *)m_marginTopText->GetValue())));
+        m_pageData.SetMarginTopLeft(wxPoint(wxAtoi((const wxChar *)m_marginLeftText->GetValue()),wxAtoi((const wxChar *)m_marginTopText->GetValue())));

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

-        m_pageData.SetMarginBottomRight(wxPoint(atoi((const char *)m_marginRightText->GetValue()),atoi((const char *)m_marginBottomText->GetValue())));
-    
+        m_pageData.SetMarginBottomRight(wxPoint(wxAtoi((const wxChar *)m_marginRightText->GetValue()),wxAtoi((const wxChar *)m_marginBottomText->GetValue())));
+

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


@@ -668,11 +776,11 @@ 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)


@@ -690,16 +798,19 @@ wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
         wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
         choices[i] = paper->GetName();
     }
         wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
         choices[i] = paper->GetName();
     }

-    
+

     (void) new wxStaticText(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(*x, *y));
     *y += 25;
     (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,
+
+    wxComboBox *choice = new wxComboBox(this, wxPRINTID_PAPERSIZE,
+                                        _("Paper Size"),
+                                        wxPoint(*x, *y), wxSize(300, -1), n,

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

-    
+

 //    choice->SetSelection(sel);
     return choice;
 }
 
 //    choice->SetSelection(sel);
     return choice;
 }
 

+#endif