// 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
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "prntdlgg.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma implementation "prntdlgg.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #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/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/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/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"
+
+#if wxUSE_POSTSCRIPT
+ #include "wx/generic/dcpsg.h"
+#endif
+
#include "wx/printdlg.h"
+#include "wx/paper.h"
+#include "wx/filename.h"
+
+// For print paper things
+#include "wx/prntbase.h"
#include <stdlib.h>
#include <string.h>
-#if !USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+
+#if wxUSE_POSTSCRIPT
+
IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
-IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
END_EVENT_TABLE()
+#endif // wxUSE_POSTSCRIPT
+
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+
BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
END_EVENT_TABLE()
-#endif
+
+// ----------------------------------------------------------------------------
+// global vars
+// ----------------------------------------------------------------------------
extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
-/*
- * Generic print dialog for non-Windows printing use.
- */
+#if wxUSE_POSTSCRIPT
+
+// ----------------------------------------------------------------------------
+// Generic print dialog for non-Windows printing use.
+// ----------------------------------------------------------------------------
+wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
+ wxPrintDialogData* data)
+ : wxDialog(parent, wxID_ANY, _("Print"),
+ wxPoint(0, 0), wxSize(600, 600),
+ wxDEFAULT_DIALOG_STYLE |
+ wxTAB_TRAVERSAL)
+{
+ if ( data )
+ m_printDialogData = *data;
+
+ Init(parent);
+}
-wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintData* data):
- wxDialog(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
+ wxPrintData* data)
+ : wxDialog(parent, wxID_ANY, _("Print"),
+ wxPoint(0, 0), wxSize(600, 600),
+ wxDEFAULT_DIALOG_STYLE |
+ wxTAB_TRAVERSAL)
{
- if ( data )
- printData = *data;
-
- (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
-
- printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(20, 25) );
-
- setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(160, 25), wxSize(100, -1));
-
- wxString *choices = new wxString[2];
- choices[0] = _("All");
- choices[1] = _("Pages");
-
- fromText = (wxTextCtrl*)NULL;
-
- if(printData.GetFromPage() != 0)
- {
- rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
- wxPoint(5, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL);
- rangeRadioBox->SetSelection(1);
- }
-
- if(printData.GetFromPage() != 0)
- {
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(5, 135));
-
- fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(45, 130), wxSize(40, -1));
-
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(100, 135));
-
- toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(133, 130), wxSize(40, -1));
- }
-
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(200, 135));
-
- 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();
- Centre(wxBOTH);
-
- // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
- InitDialog();
- delete[] choices;
+ if ( data )
+ m_printDialogData = *data;
+
+ Init(parent);
+}
+
+void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
+{
+ // 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
+
+ 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 );
+
+ 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");
+
+ 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"),
+ wxDefaultPosition, wxDefaultSize,
+ 2, choices,
+ 1, wxRA_VERTICAL);
+ m_rangeRadioBox->SetSelection(1);
+
+ mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
+ }
+
+ // 3) bottom row
+
+ wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
+
+ if (m_printDialogData.GetFromPage() != 0)
+ {
+ bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
+ m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord));
+ bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
+
+ bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
+ m_toText = new wxTextCtrl(this, wxPRINTID_TO, wxEmptyString, wxDefaultPosition, wxSize(40, wxDefaultCoord));
+ bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
+ }
+
+ bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );
+ m_noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, wxEmptyString, wxPoint(252, 130), wxSize(40, wxDefaultCoord));
+ bottomsizer->Add( m_noCopiesText, 1, wxCENTER|wxRIGHT, 10 );
+
+ mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
+
+#if wxUSE_STATLINE
+ // 4) static line
+ mainsizer->Add( new wxStaticLine( this, wxID_ANY ), 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);
+
+ // Calls wxWindow::OnInitDialog and then wxGenericPrintDialog::TransferDataToWindow
+ InitDialog();
+ delete[] choices;
}
-int wxGenericPrintDialog::ShowModal(void)
+int wxGenericPrintDialog::ShowModal()
{
- if ( printData.GetSetupDialog() )
+ if ( m_printDialogData.GetSetupDialog() )
{
+ // Make sure wxPrintData object reflects the settings now, in case the setup dialog
+ // changes it. In fact there aren't any common settings at
+ // present, but there might be in future.
+ // TransferDataFromWindow();
+
wxGenericPrintSetupDialog *genericPrintSetupDialog =
- new wxGenericPrintSetupDialog(GetParent(), wxThePrintSetupData);
+ new wxGenericPrintSetupDialog(this, & m_printDialogData.GetPrintData());
int ret = genericPrintSetupDialog->ShowModal();
if ( ret != wxID_CANCEL )
{
- *wxThePrintSetupData = genericPrintSetupDialog->printData;
+ // Transfer settings to the print dialog's print data.
+ m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
}
- genericPrintSetupDialog->Close(TRUE);
+ genericPrintSetupDialog->Destroy();
+
+ // Restore the wxPrintData settings again (uncomment if any settings become common
+ // to both dialogs)
+ // TransferDataToWindow();
+
return ret;
}
else
}
}
-wxGenericPrintDialog::~wxGenericPrintDialog(void)
+wxGenericPrintDialog::~wxGenericPrintDialog()
{
}
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
- // or not.
- if (printData.GetPrintToFile())
- {
- wxThePrintSetupData->SetPrinterMode(PS_FILE);
-
- wxString f = wxFileSelector(_("PostScript file"),
- wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
- wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
- "ps", "*.ps", 0, this);
- if ( f.IsEmpty() )
- return;
-
- wxThePrintSetupData->SetPrinterFile(f);
- }
- else
- wxThePrintSetupData->SetPrinterMode(PS_PRINTER);
-
- EndModal(wxID_OK);
+ 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
+ // or not.
+ if (m_printDialogData.GetPrintToFile())
+ {
+ m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
+
+ 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);
+ }
+
+ EndModal(wxID_OK);
}
void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
{
- if (!fromText) return;
-
- if (event.GetInt() == 0)
- {
- fromText->Enable(FALSE);
- toText->Enable(FALSE);
- }
- else if (event.GetInt() == 1)
- {
- fromText->Enable(TRUE);
- toText->Enable(TRUE);
- }
+ if (!m_fromText) return;
+
+ if (event.GetInt() == 0)
+ {
+ m_fromText->Enable(false);
+ m_toText->Enable(false);
+ }
+ else if (event.GetInt() == 1)
+ {
+ m_fromText->Enable(true);
+ m_toText->Enable(true);
+ }
}
void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
{
- wxGenericPrintSetupDialog *genericPrintSetupDialog =
- new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
- int ret = genericPrintSetupDialog->ShowModal();
- if ( ret != wxID_CANCEL )
- {
- *wxThePrintSetupData = genericPrintSetupDialog->printData;
- printData.SetOrientation(wxThePrintSetupData->GetPrinterOrientation());
- }
-
- genericPrintSetupDialog->Close(TRUE);
+ wxGenericPrintSetupDialog dialog( this, &m_printDialogData.GetPrintData() );
+ if (dialog.ShowModal() != wxID_CANCEL)
+ {
+ m_printDialogData = dialog.GetPrintData();
+ }
}
-bool wxGenericPrintDialog::TransferDataToWindow(void)
+bool wxGenericPrintDialog::TransferDataToWindow()
{
- char buf[10];
-
- if(printData.GetFromPage() != 0)
- {
- if (printData.GetEnablePageNumbers())
- {
- fromText->Enable(TRUE);
- toText->Enable(TRUE);
-
- sprintf(buf, "%d", printData.GetFromPage());
- fromText->SetValue(buf);
- sprintf(buf, "%d", printData.GetToPage());
- toText->SetValue(buf);
-
- if (printData.GetAllPages())
- rangeRadioBox->SetSelection(0);
- else
- rangeRadioBox->SetSelection(1);
- }
- else
- {
- fromText->Enable(FALSE);
- toText->Enable(FALSE);
- rangeRadioBox->SetSelection(0);
- rangeRadioBox->wxRadioBox::Enable(1, FALSE);
- }
- }
- sprintf(buf, "%d", printData.GetNoCopies());
- noCopiesText->SetValue(buf);
-
- printToFileCheckBox->SetValue(printData.GetPrintToFile());
- printToFileCheckBox->Enable(printData.GetEnablePrintToFile());
- return TRUE;
+ if(m_printDialogData.GetFromPage() != 0)
+ {
+ if(m_fromText)
+ {
+ if (m_printDialogData.GetEnablePageNumbers())
+ {
+ m_fromText->Enable(true);
+ m_toText->Enable(true);
+ if (m_printDialogData.GetFromPage() > 0)
+ m_fromText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
+ if (m_printDialogData.GetToPage() > 0)
+ m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
+ if(m_rangeRadioBox)
+ if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
+ 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->wxRadioBox::Enable(1, false);
+ }
+ }
+ }
+ }
+ m_noCopiesText->SetValue(
+ wxString::Format(_T("%d"), m_printDialogData.GetNoCopies()));
+
+ m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
+ m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());
+ return true;
}
-bool wxGenericPrintDialog::TransferDataFromWindow(void)
+bool wxGenericPrintDialog::TransferDataFromWindow()
{
- if(printData.GetFromPage() != -1)
- {
- if (printData.GetEnablePageNumbers())
- {
- printData.SetFromPage(atoi(fromText->GetValue()));
- printData.SetToPage(atoi(toText->GetValue()));
- }
- if (rangeRadioBox->GetSelection() == 0)
- printData.SetAllPages(TRUE);
- else
- printData.SetAllPages(FALSE);
- }
- else
- { // continuous printing
- printData.SetFromPage(1);
- printData.SetToPage(32000);
- }
- printData.SetNoCopies(atoi(noCopiesText->GetValue()));
- printData.SetPrintToFile(printToFileCheckBox->GetValue());
-
- return TRUE;
+ long res = 0;
+ if(m_printDialogData.GetFromPage() != -1)
+ {
+ if (m_printDialogData.GetEnablePageNumbers())
+ {
+ if(m_fromText)
+ {
+ wxString value = m_fromText->GetValue();
+ if (value.ToLong( &res ))
+ m_printDialogData.SetFromPage( res );
+ }
+ if(m_toText)
+ {
+ wxString value = m_toText->GetValue();
+ if (value.ToLong( &res ))
+ m_printDialogData.SetToPage( res );
+ }
+ }
+ if(m_rangeRadioBox)
+ {
+ if (m_rangeRadioBox->GetSelection() == 0)
+ m_printDialogData.SetAllPages(true);
+ else
+ m_printDialogData.SetAllPages(false);
+ }
+ }
+ else
+ { // continuous printing
+ m_printDialogData.SetFromPage(1);
+ m_printDialogData.SetToPage(32000);
+ }
+
+ wxString value = m_noCopiesText->GetValue();
+ if (value.ToLong( &res ))
+ m_printDialogData.SetNoCopies( res );
+
+ m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
+
+ return true;
}
-wxDC *wxGenericPrintDialog::GetPrintDC(void)
+/*
+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()
{
- 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, wxPrintSetupData* data):
- wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
+wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
{
- if ( data )
- printData = *data;
+ Init(data);
+}
- (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(10, 10), wxSize(200,60) );
+void wxGenericPrintSetupDialog::Init(wxPrintData* data)
+{
+ if ( data )
+ m_printData = *data;
- int xPos = 20;
- int yPos = 30;
- paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
+ int staticBoxWidth = 300;
- wxString *choices = new wxString[2];
- choices[0] = _("Portrait");
- choices[1] = _("Landscape");
+ (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(10, 10), wxSize(staticBoxWidth, 60) );
- orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
- wxPoint(10, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL );
- orientationRadioBox->SetSelection(0);
+ int xPos = 20;
+ int yPos = 30;
+ m_paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
- (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(200,50) );
+ wxString *choices = new wxString[2];
+ choices[0] = _("Portrait");
+ choices[1] = _("Landscape");
- int colourXPos = 145;
+ m_orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
+ wxPoint(10, 80), wxDefaultSize, 2, choices, 1, wxRA_VERTICAL );
+ m_orientationRadioBox->SetSelection(0);
+
+ (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(staticBoxWidth, 50) );
+
+ int colourYPos = 145;
#ifdef __WXMOTIF__
- colourXPos = 150;
+ colourYPos = 150;
#endif
-
- colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourXPos));
-
- (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(230, 10), wxSize(200,170) );
-
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(240, 30));
+ 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) );
- printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, "", wxPoint(260, 55), wxSize(150, -1));
+ (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer command:"), wxPoint(340, 30));
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(240, 110));
+ m_printerCommandText = new wxTextCtrl(this, wxPRINTID_COMMAND, wxEmptyString, wxPoint(360, 55), wxSize(150, wxDefaultCoord));
- printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, "", wxPoint(260, 135), wxSize(150, -1));
+ (void) new wxStaticText(this, wxPRINTID_STATIC, _("Printer options:"), wxPoint(340, 110));
- wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(80, 200), wxSize(100, -1));
- (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(270, 200), wxSize(100, -1));
+ m_printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, wxEmptyString, wxPoint(360, 135), wxSize(150, wxDefaultCoord));
- okButton->SetDefault();
- okButton->SetFocus();
+ 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));
- Fit();
- Centre(wxBOTH);
+ okButton->SetDefault();
+ okButton->SetFocus();
- InitDialog();
- delete[] choices;
+ Fit();
+ Centre(wxBOTH);
+
+ InitDialog();
+ delete[] choices;
}
-wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog(void)
+wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog()
{
}
-bool wxGenericPrintSetupDialog::TransferDataToWindow(void)
+bool wxGenericPrintSetupDialog::TransferDataToWindow()
{
- if (printerCommandText && printData.GetPrinterCommand())
- printerCommandText->SetValue(printData.GetPrinterCommand());
- if (printerOptionsText && printData.GetPrinterOptions())
- printerOptionsText->SetValue(printData.GetPrinterOptions());
- if (colourCheckBox)
- colourCheckBox->SetValue(printData.GetColour());
-
- if (orientationRadioBox)
- {
- if (printData.GetPrinterOrientation() == PS_PORTRAIT)
- orientationRadioBox->SetSelection(0);
- else
- orientationRadioBox->SetSelection(1);
- }
- return TRUE;
+ if (m_printerCommandText && m_printData.GetPrinterCommand())
+ m_printerCommandText->SetValue(m_printData.GetPrinterCommand());
+ if (m_printerOptionsText && m_printData.GetPrinterOptions())
+ m_printerOptionsText->SetValue(m_printData.GetPrinterOptions());
+ if (m_colourCheckBox)
+ m_colourCheckBox->SetValue(m_printData.GetColour());
+
+ if (m_orientationRadioBox)
+ {
+ if (m_printData.GetOrientation() == wxPORTRAIT)
+ m_orientationRadioBox->SetSelection(0);
+ else
+ m_orientationRadioBox->SetSelection(1);
+ }
+ return true;
}
-bool wxGenericPrintSetupDialog::TransferDataFromWindow(void)
+bool wxGenericPrintSetupDialog::TransferDataFromWindow()
{
- if (printerCommandText)
- printData.SetPrinterCommand(WXSTRINGCAST printerCommandText->GetValue());
- if (printerOptionsText)
- printData.SetPrinterOptions(WXSTRINGCAST printerOptionsText->GetValue());
- if (colourCheckBox)
- printData.SetColour(colourCheckBox->GetValue());
- if (orientationRadioBox)
- {
- int sel = orientationRadioBox->GetSelection();
- if (sel == 0)
- printData.SetPrinterOrientation(PS_PORTRAIT);
- else
- printData.SetPrinterOrientation(PS_LANDSCAPE);
- }
- if (paperTypeChoice)
- {
- wxString val(paperTypeChoice->GetStringSelection());
- if (!val.IsNull() && val != "")
- printData.SetPaperName((char *)(const char *)val);
- }
- *wxThePrintSetupData = GetPrintData();
- return TRUE;
+ if (m_printerCommandText)
+ m_printData.SetPrinterCommand(m_printerCommandText->GetValue());
+ if (m_printerOptionsText)
+ m_printData.SetPrinterOptions(m_printerOptionsText->GetValue());
+ if (m_colourCheckBox)
+ m_printData.SetColour(m_colourCheckBox->GetValue());
+ if (m_orientationRadioBox)
+ {
+ int sel = m_orientationRadioBox->GetSelection();
+ if (sel == 0)
+ m_printData.SetOrientation(wxPORTRAIT);
+ else
+ m_printData.SetOrientation(wxLANDSCAPE);
+ }
+ if (m_paperTypeChoice)
+ {
+ int selectedItem = m_paperTypeChoice->GetSelection();
+ if (selectedItem != -1)
+ {
+ wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(selectedItem);
+ if (paper != NULL)
+ m_printData.SetPaperId( paper->GetId());
+ }
+ }
+
+ return true;
}
-wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y)
{
- if (!wxThePrintPaperDatabase)
- {
- wxThePrintPaperDatabase = new wxPrintPaperDatabase;
- wxThePrintPaperDatabase->CreateDatabase();
- }
- int n = wxThePrintPaperDatabase->Number();
- wxString *choices = new wxString [n];
- int sel = 0;
- int i;
- for (i = 0; i < n; i++)
- {
- wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
- choices[i] = paper->pageName;
- if (printData.GetPaperName() && choices[i] == printData.GetPaperName())
- sel = i;
- }
-
- int width = 170;
-#ifdef __WXMOTIF__
- width = 150;
-#endif
+/* 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;
+
+ for (size_t i = 0; i < n; i++)
+ {
+ wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i);
+ choices[i] = paper->GetName();
+ if (m_printData.GetPaperId() == paper->GetId())
+ sel = i;
+ }
- wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(width, -1), n,
- choices);
-
- delete[] choices;
+ int width = 250;
- choice->SetSelection(sel);
- return choice;
+ wxComboBox *choice = new wxComboBox( this,
+ wxPRINTID_PAPERSIZE,
+ _("Paper Size"),
+ wxPoint(*x, *y),
+ wxSize(width, wxDefaultCoord),
+ n, choices );
+
+ // SetFont(thisFont);
+
+ delete[] choices;
+
+ choice->SetSelection(sel);
+ return choice;
}
+#endif // wxUSE_POSTSCRIPT
-/*
- * Generic page setup dialog
- */
+// ----------------------------------------------------------------------------
+// Generic page setup dialog
+// ----------------------------------------------------------------------------
void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
{
// printing under Windows (and only in 16-bit Windows which
// doesn't have a Windows-specific page setup dialog) it's worth it.
- wxPrintData data;
- data.SetSetupDialog(TRUE);
+ // 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 = new wxPrintDialog(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
+
printDialog->Destroy();
-#if 0
- if (wxTheApp->GetPrintMode() == wxPRINT_POSTSCRIPT)
- {
- wxGenericPrintSetupDialog *genericPrintSetupDialog =
- new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
- int ret = genericPrintSetupDialog->ShowModal();
- if (ret == wxID_OK)
- *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
-
- genericPrintSetupDialog->Close(TRUE);
- }
-#ifdef __WXMSW__
- else
- {
- wxPrintData data;
- data.SetSetupDialog(TRUE);
- wxPrintDialog printDialog(this, & data);
- printDialog.ShowModal();
- }
-#endif
-#endif
- // 0
+ // Now update the dialog in case the page setup dialog changed some of our settings.
+ TransferDataToWindow();
}
-wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data):
- wxDialog(parent, -1, _("Page Setup"), wxPoint(0, 0), wxSize(600, 600), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE)
+wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
+ wxPageSetupData* data)
+ : wxDialog( parent,
+ wxID_ANY,
+ _("Page Setup"),
+ wxPoint(0, 0),
+ wxSize(600, 600),
+ wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
{
- if ( data )
- 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));
+ if (data)
+ m_pageData = *data;
- printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight));
+ int textWidth = 80;
- if ( !pageData.GetEnablePrinter() )
- printerButton->Enable(FALSE);
+ wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
-// if (printData.GetEnableHelp())
-// wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), -1, -1, buttonWidth, buttonHeight);
+ // 1) top
+ wxStaticBoxSizer *topsizer = new wxStaticBoxSizer(
+ new wxStaticBox(this,wxPRINTID_STATIC, _("Paper size")), wxHORIZONTAL );
- okButton->SetDefault();
- okButton->SetFocus();
+ size_t n = wxThePrintPaperDatabase->GetCount();
+ wxString *choices = new wxString [n];
- xPos = 5;
- yPos += 35;
-
-#ifdef __WXMOTIF__
- yPos += 10;
-#endif
-
- paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos);
-
- xPos = 5;
-
- wxString *choices = new wxString[2];
- choices[0] = _("Portrait");
- choices[1] = _("Landscape");
- orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
- wxPoint(xPos, yPos), wxSize(-1, -1), 2, choices, 2);
- orientationRadioBox->SetSelection(0);
-
- xPos = 5;
- yPos += 60;
+ for (size_t i = 0; i < n; i++)
+ {
+ wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i);
+ choices[i] = paper->GetName();
+ }
- int staticWidth = 110;
-#ifdef __WXMOTIF__
- staticWidth += 20;
+ m_paperTypeChoice = new wxComboBox( this,
+ wxPRINTID_PAPERSIZE,
+ _("Paper Size"),
+ wxDefaultPosition,
+ wxSize(300, wxDefaultCoord),
+ n, choices );
+ topsizer->Add( m_paperTypeChoice, 1, wxEXPAND|wxALL, 5 );
+// m_paperTypeChoice->SetSelection(sel);
+
+ 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, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+ m_marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+ column2->Add( m_marginLeftText, 1, wxALL, 5 );
+ column2->Add( m_marginTopText, 1, wxALL, 5 );
+ table->Add( column2, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
+
+ 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, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+ m_marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, wxEmptyString, wxDefaultPosition, wxSize(textWidth, wxDefaultCoord));
+ column4->Add( m_marginRightText, 1, wxALL, 5 );
+ column4->Add( m_marginBottomText, 1, wxALL, 5 );
+ table->Add( column4, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, 5 );
+
+ mainsizer->Add( table, 0 );
+
+#if wxUSE_STATLINE
+ // 5) static line
+ mainsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
#endif
- int textWidth = 60;
- spacing = 10;
+ // 6) buttons
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Left margin (mm):"), wxPoint(xPos, yPos));
- xPos += staticWidth;
+ 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"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight);
+ mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
- 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;
+ SetAutoLayout( true );
+ SetSizer( mainsizer );
- marginRightText = new wxTextCtrl(this, wxPRINTID_RIGHTMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
- xPos += textWidth + spacing;
+ mainsizer->Fit( this );
+ Centre(wxBOTH);
- yPos += 35;
- xPos = 5;
+ InitDialog();
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Top margin (mm):"), wxPoint(xPos, yPos));
- xPos += staticWidth;
+ delete[] choices;
+ delete [] choices2;
+}
- marginTopText = new wxTextCtrl(this, wxPRINTID_TOPMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
- xPos += textWidth + spacing;
+wxGenericPageSetupDialog::~wxGenericPageSetupDialog()
+{
+}
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Bottom margin (mm):"), wxPoint(xPos, yPos));
- xPos += staticWidth;
+bool wxGenericPageSetupDialog::TransferDataToWindow()
+{
+ if (m_marginLeftText)
+ m_marginLeftText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginTopLeft().x));
+ if (m_marginTopText)
+ m_marginTopText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginTopLeft().y));
+ if (m_marginRightText)
+ m_marginRightText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().x));
+ if (m_marginBottomText)
+ m_marginBottomText->SetValue(wxString::Format(wxT("%d"), m_pageData.GetMarginBottomRight().y));
+
+ if (m_orientationRadioBox)
+ {
+ if (m_pageData.GetPrintData().GetOrientation() == wxPORTRAIT)
+ m_orientationRadioBox->SetSelection(0);
+ else
+ m_orientationRadioBox->SetSelection(1);
+ }
- marginBottomText = new wxTextCtrl(this, wxPRINTID_BOTTOMMARGIN, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
+ // Find the paper type from either the current paper size in the wxPageSetupDialogData, or
+ // failing that, the id in the wxPrintData object.
- Fit();
- Centre(wxBOTH);
+ wxPrintPaperType* type = wxThePrintPaperDatabase->FindPaperType(
+ wxSize(m_pageData.GetPaperSize().x * 10, m_pageData.GetPaperSize().y * 10));
- InitDialog();
- delete [] choices;
-}
+ if (!type && m_pageData.GetPrintData().GetPaperId() != wxPAPER_NONE)
+ type = wxThePrintPaperDatabase->FindPaperType(m_pageData.GetPrintData().GetPaperId());
-wxGenericPageSetupDialog::~wxGenericPageSetupDialog(void)
-{
-}
+ if (type)
+ {
+ m_paperTypeChoice->SetStringSelection(type->GetName());
+ }
-bool wxGenericPageSetupDialog::TransferDataToWindow(void)
-{
- if (marginLeftText)
- marginLeftText->SetValue(IntToString((int) pageData.GetMarginTopLeft().x));
- if (marginTopText)
- marginTopText->SetValue(IntToString((int) pageData.GetMarginTopLeft().y));
- if (marginRightText)
- marginRightText->SetValue(IntToString((int) pageData.GetMarginBottomRight().x));
- if (marginBottomText)
- marginBottomText->SetValue(IntToString((int) pageData.GetMarginBottomRight().y));
-
- if (orientationRadioBox)
- {
- if (pageData.GetOrientation() == wxPORTRAIT)
- orientationRadioBox->SetSelection(0);
- else
- orientationRadioBox->SetSelection(1);
- }
- return TRUE;
+ return true;
}
-bool wxGenericPageSetupDialog::TransferDataFromWindow(void)
+bool wxGenericPageSetupDialog::TransferDataFromWindow()
{
- if (marginLeftText && marginTopText)
- pageData.SetMarginTopLeft(wxPoint(atoi((const char *)marginLeftText->GetValue()),atoi((const char *)marginTopText->GetValue())));
- if (marginRightText && marginBottomText)
- pageData.SetMarginBottomRight(wxPoint(atoi((const char *)marginRightText->GetValue()),atoi((const char *)marginBottomText->GetValue())));
-
- if (orientationRadioBox)
- {
- int sel = orientationRadioBox->GetSelection();
- if (sel == 0)
+ if (m_marginLeftText && m_marginTopText)
{
- wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT);
- pageData.SetOrientation(wxPORTRAIT);
+ int left = wxAtoi( m_marginLeftText->GetValue().c_str() );
+ int top = wxAtoi( m_marginTopText->GetValue().c_str() );
+ m_pageData.SetMarginTopLeft( wxPoint(left,top) );
}
- else
+ if (m_marginRightText && m_marginBottomText)
{
- wxThePrintSetupData->SetPrinterOrientation(wxLANDSCAPE);
- pageData.SetOrientation(wxLANDSCAPE);
+ int right = wxAtoi( m_marginRightText->GetValue().c_str() );
+ int bottom = wxAtoi( m_marginBottomText->GetValue().c_str() );
+ m_pageData.SetMarginBottomRight( wxPoint(right,bottom) );
}
- }
- if (paperTypeChoice)
- {
- wxString val(paperTypeChoice->GetStringSelection());
- if (!val.IsNull() && val != "")
+
+ if (m_orientationRadioBox)
{
- wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType((char*) (const char *)val);
- if ( paper )
+ int sel = m_orientationRadioBox->GetSelection();
+ if (sel == 0)
+ {
+ m_pageData.GetPrintData().SetOrientation(wxPORTRAIT);
+ }
+ else
{
- pageData.SetPaperSize(wxPoint(paper->widthMM, paper->heightMM));
+ m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE);
}
}
- }
- return TRUE;
+ if (m_paperTypeChoice)
+ {
+ int selectedItem = m_paperTypeChoice->GetSelection();
+ if (selectedItem != -1)
+ {
+ wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(selectedItem);
+ if ( paper )
+ {
+ m_pageData.SetPaperSize(wxSize(paper->GetWidth()/10, paper->GetHeight()/10));
+ m_pageData.GetPrintData().SetPaperId(paper->GetId());
+ }
+ }
+ }
+
+ return true;
}
-wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
+wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
{
- if (!wxThePrintPaperDatabase)
- {
- wxThePrintPaperDatabase = new wxPrintPaperDatabase;
- wxThePrintPaperDatabase->CreateDatabase();
- }
- int n = wxThePrintPaperDatabase->Number();
- wxString *choices = new wxString [n];
- int sel = 0;
- int i;
- for (i = 0; i < n; i++)
- {
- wxPrintPaperType *paper = (wxPrintPaperType *)wxThePrintPaperDatabase->Nth(i)->Data();
- choices[i] = paper->pageName;
- if (pageData.GetPaperSize().x == paper->widthMM && pageData.GetPaperSize().y == paper->heightMM)
- sel = i;
- }
-
- (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);
- *y += 35;
- delete[] choices;
-
- choice->SetSelection(sel);
- return choice;
+/*
+ if (!wxThePrintPaperDatabase)
+ {
+ wxThePrintPaperDatabase = new wxPrintPaperDatabase;
+ wxThePrintPaperDatabase->CreateDatabase();
+ }
+*/
+
+ size_t n = wxThePrintPaperDatabase->GetCount();
+ wxString *choices = new wxString [n];
+
+ for (size_t i = 0; i < n; i++)
+ {
+ wxPrintPaperType *paper = wxThePrintPaperDatabase->Item(i);
+ choices[i] = paper->GetName();
+ }
+
+ (void) new wxStaticText(this, wxPRINTID_STATIC, _("Paper size"), wxPoint(*x, *y));
+ *y += 25;
+
+ wxComboBox *choice = new wxComboBox( this,
+ wxPRINTID_PAPERSIZE,
+ _("Paper Size"),
+ wxPoint(*x, *y),
+ wxSize(300, wxDefaultCoord),
+ n, choices );
+ *y += 35;
+ delete[] choices;
+
+// choice->SetSelection(sel);
+ return choice;
}
+#endif
+
projects / wxWidgets.git / blobdiff