// 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
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "prntdlgg.h"
#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"
- #include "wx/app.h"
- #include "wx/frame.h"
#include "wx/stattext.h"
#include "wx/statbox.h"
#include "wx/button.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"
#include "wx/printdlg.h"
#include "wx/paper.h"
+#include "wx/filename.h"
// For print paper things
#include "wx/prntbase.h"
// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
#if wxUSE_POSTSCRIPT
- IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
- IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
- BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
- EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
- EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
- EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
- END_EVENT_TABLE()
-#endif
+BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
+ EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
+ EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
+ EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
+END_EVENT_TABLE()
- IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+#endif // wxUSE_POSTSCRIPT
- BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
- EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
- END_EVENT_TABLE()
-#endif // USE_SHARED_LIBRARY
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+ EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
+END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// global vars
#if wxUSE_POSTSCRIPT
-// ============================================================================
-// implementation
-// ============================================================================
-
// ----------------------------------------------------------------------------
// Generic print dialog for non-Windows printing use.
// ----------------------------------------------------------------------------
// wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
// wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
- (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
+ wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
- m_printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(20, 25) );
+ // 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 );
- m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(160, 25), wxSize(100, -1));
+ topsizer->Add( 60,2,1 );
+ m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );
+ topsizer->Add( m_setupButton, 0, wxCENTER|wxALL, 5 );
+
+ mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
+
+ // 2) middle row with radio box
+
wxString *choices = new wxString[2];
choices[0] = _("All");
choices[1] = _("Pages");
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);
+
+ mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
}
- if(m_printDialogData.GetFromPage() != 0)
+ // 3) bottom row
+
+ wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
+
+ if (m_printDialogData.GetFromPage() != 0)
{
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(5, 135));
+ bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
+ m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxT(""), wxDefaultPosition, wxSize(40, -1));
+ bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
- m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(45, 130), wxSize(40, -1));
+ bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
+ m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxT(""), wxDefaultPosition, wxSize(40, -1));
+ bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
+ }
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(100, 135));
+ bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );
+ m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxT(""), wxPoint(252, 130), wxSize(40, -1));
+ bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
- m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(133, 130), wxSize(40, -1));
- }
+ 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
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(200, 135));
+ // 5) buttons
- m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1));
+ mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
- 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));
+ SetAutoLayout( TRUE );
+ SetSizer( mainsizer );
- okButton->SetDefault();
- okButton->SetFocus();
- Fit();
+ mainsizer->Fit( this );
Centre(wxBOTH);
// Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
int ret = genericPrintSetupDialog->ShowModal();
if ( ret != wxID_CANCEL )
{
- // Transfer settings to the global object (for compatibility) and to
- // the print dialog's print data.
- *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
+ // Transfer settings to the print dialog's print data.
m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
}
genericPrintSetupDialog->Destroy();
{
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
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;
-
- m_printDialogData.GetPrintData().SetFilename(f);
- wxThePrintSetupData->SetPrinterFile(f);
+
+ wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
+
+ wxFileDialog dialog( this, _("PostScript file"),
+ fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
+ if (dialog.ShowModal() != wxID_OK) return;
+
+ m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
}
else
{
m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
- wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);
}
EndModal(wxID_OK);
void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
{
- *wxThePrintSetupData = m_printDialogData.GetPrintData();
- wxGenericPrintSetupDialog *genericPrintSetupDialog =
- new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
- int ret = genericPrintSetupDialog->ShowModal();
- if ( ret != wxID_CANCEL )
+ wxGenericPrintSetupDialog dialog( this, &m_printDialogData.GetPrintData() );
+ if (dialog.ShowModal() != wxID_CANCEL)
{
- *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
- m_printDialogData = genericPrintSetupDialog->GetPrintData();
+ m_printDialogData = dialog.GetPrintData();
}
-
- genericPrintSetupDialog->Close(TRUE);
}
bool wxGenericPrintDialog::TransferDataToWindow()
{
- char buf[10];
-
if(m_printDialogData.GetFromPage() != 0)
{
if(m_fromText)
{
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.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_printDialogData.GetAllPages())
+ if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
m_rangeRadioBox->SetSelection(0);
else
m_rangeRadioBox->SetSelection(1);
}
}
}
- 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());
bool wxGenericPrintDialog::TransferDataFromWindow()
{
+ long res = 0;
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)
{
m_printDialogData.SetFromPage(1);
m_printDialogData.SetToPage(32000);
}
- m_printDialogData.SetNoCopies(wxAtoi(m_noCopiesText->GetValue()));
+
+ wxString value = m_noCopiesText->GetValue();
+ if (value.ToLong( &res ))
+ m_printDialogData.SetNoCopies( res );
+
m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
return TRUE;
Init(data);
}
-// Convert wxPrintSetupData to standard wxPrintData object
-wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data):
-wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
-{
- wxPrintData printData;
- if (data)
- printData = * data;
- else
- printData = * wxThePrintSetupData;
-
- Init(& printData);
-}
-
void wxGenericPrintSetupDialog::Init(wxPrintData* data)
{
if ( data )
(void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
- m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, "", wxPoint(360, 55), wxSize(150, -1));
+ m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxT(""), wxPoint(360, 55), wxSize(150, -1));
(void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
- m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, "", wxPoint(360, 135), wxSize(150, -1));
+ m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxT(""), wxPoint(360, 135), wxSize(150, -1));
- wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(130, 200), wxSize(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();
-
+
Fit();
Centre(wxBOTH);
}
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;
}
-wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
{
/* Should not be necessary
if (!wxThePrintPaperDatabase)
wxThePrintPaperDatabase->CreateDatabase();
}
*/
- int n = wxThePrintPaperDatabase->Number();
- wxString *choices = new wxString [n];
- int sel = 0;
- int i;
- for (i = 0; i < n; i++)
+ size_t n = wxThePrintPaperDatabase->GetCount();
+ wxString *choices = new wxString [n];
+ size_t sel = 0;
+
+ for (size_t i = 0; i < n; i++)
{
- wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
+ wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i);
choices[i] = paper->GetName();
if (m_printData.GetPaperId() == paper->GetId())
sel = i;
int width = 250;
- wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(width, -1), n,
- choices);
+ wxComboBox *choice = new wxComboBox( this,
+ wxPRINTID_PAPERSIZE,
+ _("Paper Size"),
+ wxPoint(*x, *y),
+ wxSize(width, -1),
+ n, choices );
// SetFont(thisFont);
TransferDataToWindow();
}
-wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data):
-wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
+wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
+ wxPageSetupData* data)
+ : wxDialog( parent,
+ -1,
+ _("Page Setup"),
+ wxPoint(0, 0),
+ wxSize(600, 600),
+ wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
{
- if ( data )
+ if (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));
+ int textWidth = 80;
- m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight));
+ wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
- if ( !m_pageData.GetEnablePrinter() )
- m_printerButton->Enable(FALSE);
+ // 1) top
+ wxStaticBoxSizer *topsizer = new wxStaticBoxSizer(
+ new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL );
- // if (m_printData.GetEnableHelp())
- // wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), -1, -1, buttonWidth, buttonHeight);
-
- 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, -1),
+ 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"),
- wxPoint(xPos, yPos), wxSize(-1, -1), 2, choices, 2);
+ wxDefaultPosition, wxDefaultSize, 2, choices2, 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;
+ mainsizer->Add( m_orientationRadioBox, 0, wxTOP|wxLEFT|wxRIGHT, 10 );
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Right margin (mm):"), wxPoint(xPos, yPos));
- xPos += staticWidth;
+ // 3) margins
- m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
- xPos += textWidth + spacing;
+ wxBoxSizer *table = new wxBoxSizer( wxHORIZONTAL );
- yPos += 35;
- xPos = 5;
-
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Top 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 );
+
+ wxBoxSizer *column2 = new wxBoxSizer( wxVERTICAL );
+ m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));
+ m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));
+ column2->Add( m_marginLeftText, 1, wxALL, 5 );
+ column2->Add( m_marginTopText, 1, wxALL, 5 );
+ table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
+
+ 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 );
+
+ wxBoxSizer *column4 = new wxBoxSizer( wxVERTICAL );
+ m_marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));
+ m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxT(""), wxDefaultPosition, wxSize(textWidth, -1));
+ column4->Add( m_marginRightText, 1, wxALL, 5 );
+ column4->Add( m_marginBottomText, 1, wxALL, 5 );
+ table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
+
+ mainsizer->Add( table, 0 );
+
+#if wxUSE_STATLINE
+ // 5) static line
+ mainsizer->Add( new wxStaticLine( this, -1 ), 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
+
+ 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_printData.GetEnableHelp())
+ // wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), -1, -1, buttonWidth, buttonHeight);
+ mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
- (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));
+ SetAutoLayout( TRUE );
+ SetSizer( mainsizer );
- Fit();
+ mainsizer->Fit( this );
Centre(wxBOTH);
InitDialog();
- delete [] choices;
+
+ delete[] choices;
+ delete [] choices2;
}
wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
{
}
+static inline wxString IntToString( long value )
+{
+ return wxString::Format(wxT("%ld"), value);
+}
+
bool wxGenericPageSetupDialog::TransferDataToWindow()
{
if (m_marginLeftText)
- m_marginLeftText->SetValue(IntToString((int) m_pageData.GetMarginTopLeft().x));
+ m_marginLeftText->SetValue(IntToString(m_pageData.GetMarginTopLeft().x));
if (m_marginTopText)
- m_marginTopText->SetValue(IntToString((int) m_pageData.GetMarginTopLeft().y));
+ m_marginTopText->SetValue(IntToString(m_pageData.GetMarginTopLeft().y));
if (m_marginRightText)
- m_marginRightText->SetValue(IntToString((int) m_pageData.GetMarginBottomRight().x));
+ m_marginRightText->SetValue(IntToString(m_pageData.GetMarginBottomRight().x));
if (m_marginBottomText)
- m_marginBottomText->SetValue(IntToString((int) m_pageData.GetMarginBottomRight().y));
+ m_marginBottomText->SetValue(IntToString(m_pageData.GetMarginBottomRight().y));
if (m_orientationRadioBox)
{
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)
- 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 wxUSE_POSTSCRIPT
- wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT);
-#endif
m_pageData.GetPrintData().SetOrientation(wxPORTRAIT);
}
else
{
-#if wxUSE_POSTSCRIPT
- wxThePrintSetupData->SetPrinterOrientation(wxLANDSCAPE);
-#endif
m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE);
}
}
+
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));
return TRUE;
}
-wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
{
/*
if (!wxThePrintPaperDatabase)
}
*/
- 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;
- 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, -1),
+ n, choices );
*y += 35;
delete[] choices;
return choice;
}
+#endif
+
projects / wxWidgets.git / blobdiff