X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..7948c0c24401c496c04da3c28f1f1f2f282ba327:/src/generic/prntdlgg.cpp?ds=sidebyside diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index e420201628..6f4584b82a 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -28,7 +28,7 @@ #pragma hdrstop #endif -#include "wx/defs.h" +#if wxUSE_PRINTING_ARCHITECTURE #ifndef WX_PRECOMP #include "wx/utils.h" @@ -43,7 +43,14 @@ #include "wx/radiobox.h" #include "wx/filedlg.h" #include "wx/choice.h" - #include + #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" @@ -54,6 +61,7 @@ #include "wx/printdlg.h" #include "wx/paper.h" +#include "wx/filename.h" // For print paper things #include "wx/prntbase.h" @@ -65,26 +73,25 @@ // 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 @@ -94,10 +101,6 @@ extern wxPrintPaperDatabase *wxThePrintPaperDatabase; #if wxUSE_POSTSCRIPT -// ============================================================================ -// implementation -// ============================================================================ - // ---------------------------------------------------------------------------- // Generic print dialog for non-Windows printing use. // ---------------------------------------------------------------------------- @@ -135,12 +138,24 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent)) // 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"); @@ -152,33 +167,48 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent)) 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, "", 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, "", 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, "", 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 ); - (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(200, 135)); +#if wxUSE_STATLINE + // 4) static line + mainsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); +#endif - m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1)); + // 5) buttons - wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(40, 180), wxSize(80, -1)); - (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(180, 180), wxSize(80, -1)); + mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 ); - okButton->SetDefault(); - okButton->SetFocus(); - Fit(); + SetAutoLayout( TRUE ); + SetSizer( mainsizer ); + + mainsizer->Fit( this ); Centre(wxBOTH); // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow @@ -200,9 +230,7 @@ int wxGenericPrintDialog::ShowModal() 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(); @@ -234,22 +262,18 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) 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); @@ -273,23 +297,15 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event) void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event)) { - *wxThePrintSetupData = m_printDialogData.GetPrintData(); - wxGenericPrintSetupDialog *genericPrintSetupDialog = - new wxGenericPrintSetupDialog(this, wxThePrintSetupData); - int ret = genericPrintSetupDialog->ShowModal(); - if ( ret != wxID_CANCEL ) + 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) @@ -298,10 +314,10 @@ bool wxGenericPrintDialog::TransferDataToWindow() { m_fromText->Enable(TRUE); m_toText->Enable(TRUE); - sprintf(buf, "%d", m_printDialogData.GetFromPage()); - m_fromText->SetValue(buf); - sprintf(buf, "%d", m_printDialogData.GetToPage()); - m_toText->SetValue(buf); + m_fromText->SetValue( + wxString::Format(_T("%d"), m_printDialogData.GetFromPage())); + m_toText->SetValue( + wxString::Format(_T("%d"), m_printDialogData.GetToPage())); if(m_rangeRadioBox) if (m_printDialogData.GetAllPages()) m_rangeRadioBox->SetSelection(0); @@ -320,8 +336,8 @@ bool wxGenericPrintDialog::TransferDataToWindow() } } } - 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()); @@ -330,12 +346,23 @@ bool wxGenericPrintDialog::TransferDataToWindow() 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) { @@ -350,7 +377,11 @@ bool wxGenericPrintDialog::TransferDataFromWindow() 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; @@ -377,19 +408,6 @@ wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAUL 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 ) @@ -436,7 +454,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data) okButton->SetDefault(); okButton->SetFocus(); - + Fit(); Centre(wxBOTH); @@ -490,12 +508,10 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow() m_printData.SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(val)); } - // 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) @@ -518,7 +534,9 @@ wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y) 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); @@ -568,93 +586,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) { - if ( data ) + if (data) m_pageData = *data; + + int textWidth = 80; + + wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); + + // 1) top + wxStaticBoxSizer *topsizer = new wxStaticBoxSizer( + new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL ); + + 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(); + } - int buttonWidth = 75; - int buttonHeight = 25; - int spacing = 5; -#ifdef __WXMOTIF__ - spacing = 15; -#endif - - int yPos = 5; - int xPos = 5; - - wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(5, yPos), wxSize(buttonWidth, buttonHeight)); - (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(buttonWidth + 5 + spacing, yPos), wxSize(buttonWidth, buttonHeight)); - - m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight)); - - if ( !m_pageData.GetEnablePrinter() ) - m_printerButton->Enable(FALSE); - - // 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 = 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; + mainsizer->Add( m_orientationRadioBox, 0, wxTOP|wxLEFT|wxRIGHT, 10 ); - m_marginLeftText = new wxTextCtrl(this, wxPRINTID_LEFTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1)); - xPos += textWidth + spacing; + // 3) margins - (void) new wxStaticText(this, wxPRINTID_STATIC, _("Right margin (mm):"), wxPoint(xPos, yPos)); - xPos += staticWidth; + wxBoxSizer *table = new wxBoxSizer( wxHORIZONTAL ); - 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; + 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 ); + + 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, "", 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 - 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() @@ -700,32 +726,35 @@ bool wxGenericPageSetupDialog::TransferDataToWindow() 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 != "") + if (!val.IsEmpty()) { wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(val); if ( paper ) @@ -739,7 +768,7 @@ bool wxGenericPageSetupDialog::TransferDataFromWindow() return TRUE; } -wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) +wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) { /* if (!wxThePrintPaperDatabase) @@ -761,7 +790,9 @@ wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) (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; @@ -770,3 +801,5 @@ wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) return choice; } +#endif +