/////////////////////////////////////////////////////////////////////////////
-// Name: prntdlgg.cpp
+// Name: src/generic/prntdlgg.cpp
// Purpose: Generic print dialogs
// Author: Julian Smart
// Modified by:
// 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"
#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+#include "wx/generic/prntdlgg.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dc.h"
#endif
#if wxUSE_STATLINE
- #include "wx/statline.h"
+ #include "wx/statline.h"
#endif
-#include "wx/generic/prntdlgg.h"
-
#if wxUSE_POSTSCRIPT
#include "wx/generic/dcpsg.h"
#endif
#include <stdlib.h>
#include <string.h>
+#ifndef __WXUNIVERSAL__
+
+#if wxUSE_LIBGNOMEPRINT
+ #include "wx/link.h"
+ wxFORCE_LINK_MODULE(gnome_print)
+#endif
+
+#if wxUSE_GTKPRINT
+ #include "wx/link.h"
+ wxFORCE_LINK_MODULE(gtk_print)
+#endif
+
+#endif // !wxUniv
+
// ----------------------------------------------------------------------------
// global vars
// ----------------------------------------------------------------------------
wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
{
- m_previewCommand = wxT("");
+ m_previewCommand = wxEmptyString;
#ifdef __VMS__
m_printerCommand = wxT("print");
m_printerOptions = wxT("/nonotify/queue=psqueue");
#ifdef __WXMSW__
m_printerCommand = wxT("print");
- m_printerOptions = wxT("");
+ m_printerOptions = wxEmptyString;
m_afmPath = wxT("c:\\windows\\system\\");
#endif
#if !defined(__VMS__) && !defined(__WXMSW__)
m_printerCommand = wxT("lpr");
- m_printerOptions = wxT("");
- m_afmPath = wxT("");
+ m_printerOptions = wxEmptyString;
+ m_afmPath = wxEmptyString;
#endif
m_printerScaleX = 1.0;
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintDialogData* data)
- : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
- wxPoint(0, 0), wxSize(600, 600),
+ : wxPrintDialogBase(GetParentForModalDialog(parent, 0),
+ wxID_ANY, _("Print"),
+ wxPoint(0,0), wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintData* data)
- : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
- wxPoint(0, 0), wxSize(600, 600),
+ : wxPrintDialogBase(GetParentForModalDialog(parent, 0),
+ wxID_ANY, _("Print"),
+ wxPoint(0,0), wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
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),
+ // 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
wxPrintFactory* factory = wxPrintFactory::GetFactory();
wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
flex->AddGrowableCol( 1 );
topsizer->Add( flex, 1, wxGROW );
-
+
m_printToFileCheckBox = new wxCheckBox( this, wxPRINTID_PRINTTOFILE, _("Print to File") );
flex->Add( m_printToFileCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
m_setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup...") );
flex->Add( m_setupButton, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
-
+
if (!factory->HasPrintSetupDialog())
m_setupButton->Enable( false );
-
+
if (factory->HasPrinterLine())
{
- flex->Add( new wxStaticText( this, -1, _("Printer:") ),
+ flex->Add( new wxStaticText( this, wxID_ANY, _("Printer:") ),
0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- flex->Add( new wxStaticText( this, -1, factory->CreatePrinterLine() ),
+ flex->Add( new wxStaticText( this, wxID_ANY, factory->CreatePrinterLine() ),
0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
}
if (factory->HasStatusLine())
{
- flex->Add( new wxStaticText( this, -1, _("Status:") ),
- 0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
- flex->Add( new wxStaticText( this, -1, factory->CreateStatusLine() ),
- 0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+ flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
+ 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );
+ flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
+ 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );
}
mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
choices[0] = _("All");
choices[1] = _("Pages");
- m_fromText = (wxTextCtrl*)NULL;
- m_toText = (wxTextCtrl*)NULL;
- m_rangeRadioBox = (wxRadioBox *)NULL;
+ m_fromText = NULL;
+ m_toText = NULL;
+ m_rangeRadioBox = NULL;
if (m_printDialogData.GetFromPage() != 0)
{
m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
wxDefaultPosition, wxDefaultSize,
- 2, choices,
- 1, wxRA_VERTICAL);
+ 2, choices);
m_rangeRadioBox->SetSelection(1);
mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|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
+ // 4) buttons
- mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
+ wxSizer *sizerBtn = CreateSeparatedButtonSizer( wxOK|wxCANCEL);
+ if ( sizerBtn )
+ mainsizer->Add(sizerBtn, 0, wxEXPAND|wxALL, 10 );
SetAutoLayout( true );
SetSizer( mainsizer );
wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
wxFileDialog dialog( this, _("PostScript file"),
- fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
+ fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
if (dialog.ShowModal() != wxID_OK) return;
-
+
m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
}
else
{
m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
}
-
+
EndModal(wxID_OK);
}
m_fromText->Enable(true);
m_toText->Enable(true);
if (m_printDialogData.GetFromPage() > 0)
- m_fromText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
+ m_fromText->SetValue(wxString::Format(wxT("%d"), m_printDialogData.GetFromPage()));
if (m_printDialogData.GetToPage() > 0)
- m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
+ m_toText->SetValue(wxString::Format(wxT("%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_noCopiesText->SetValue(
- wxString::Format(_T("%d"), m_printDialogData.GetNoCopies()));
+ wxString::Format(wxT("%d"), m_printDialogData.GetNoCopies()));
m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());
if (m_rangeRadioBox->GetSelection() == 0)
{
m_printDialogData.SetAllPages(true);
-
+
// This means all pages, more or less
m_printDialogData.SetFromPage(1);
m_printDialogData.SetToPage(32000);
m_printDialogData.SetNoCopies( res );
m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
-
+
return true;
}
END_EVENT_TABLE()
wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
-wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
+wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
{
Init(data);
}
/* XPM */
-static char * check_xpm[] = {
+static const char* const check_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 3 1",
/* colors */
-" s None c None",
-"X c #000000",
-". c #808080",
+" s None c None",
+"X c #000000",
+". c #808080",
/* pixels */
" ",
" ",
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
// printer selection
-
- wxStaticBoxSizer *printer_sizer = new wxStaticBoxSizer( new wxStaticBox( this, -1, _("Printer") ), wxVERTICAL );
+
+ wxStaticBoxSizer *printer_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Printer") ), wxVERTICAL );
main_sizer->Add( printer_sizer, 0, wxALL|wxGROW, 10 );
-
- m_printerListCtrl = new wxListCtrl( this, wxPRINTID_PRINTER,
- wxDefaultPosition, wxSize(-1,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
+
+ m_printerListCtrl = new wxListCtrl( this, wxPRINTID_PRINTER,
+ wxDefaultPosition, wxSize(wxDefaultCoord,100), wxLC_REPORT|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
wxImageList *image_list = new wxImageList;
image_list->Add( wxBitmap(check_xpm) );
m_printerListCtrl->AssignImageList( image_list, wxIMAGE_LIST_SMALL );
-
+
m_printerListCtrl->InsertColumn( 0, wxT(" "), wxLIST_FORMAT_LEFT, 20 );
m_printerListCtrl->InsertColumn( 1, wxT("Printer"), wxLIST_FORMAT_LEFT, 150 );
m_printerListCtrl->InsertColumn( 2, wxT("Device"), wxLIST_FORMAT_LEFT, 150 );
item.SetText( _("Default printer") );
item.SetId( m_printerListCtrl->InsertItem( item ) );
- if (data->GetPrinterName().IsEmpty())
+ if (data->GetPrinterName().empty())
{
wxListItem item2;
item2.SetId( item.GetId() );
item2.SetMask( wxLIST_MASK_IMAGE );
item2.SetImage( 0 );
m_printerListCtrl->SetItem( item2 );
+ // also select item
+ m_printerListCtrl->SetItemState( item.GetId(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
}
item.SetId( 1+ item.GetId() );
wxArrayString errors;
wxArrayString output;
- long res = wxExecute( wxT("lpstat -v"), output, errors );
+ long res = wxExecute( wxT("lpstat -v"), output, errors, wxEXEC_NODISABLE );
if (res >= 0 && errors.GetCount() == 0)
{
size_t i;
if (tmp != wxT("for"))
break; // the lpstat syntax must have changed.
tmp = tok.GetNextToken(); // "hp_deskjet930c:"
- if (tmp[tmp.Len()-1] == wxT(':'))
- tmp.Remove(tmp.Len()-1,1);
+ if (tmp[tmp.length()-1] == wxT(':'))
+ tmp.Remove(tmp.length()-1,1);
wxString name = tmp;
item.SetText( name );
item.SetId( m_printerListCtrl->InsertItem( item ) );
item2.SetMask( wxLIST_MASK_IMAGE );
item2.SetImage( 0 );
m_printerListCtrl->SetItem( item2 );
+ // also select item
+ m_printerListCtrl->SetItemState( item.GetId(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
}
-
+
wxString command = wxT("lpstat -p ");
command += name;
wxArrayString errors2;
wxArrayString output2;
- res = wxExecute( command, output2, errors2 );
+ res = wxExecute( command, output2, errors2, wxEXEC_NODISABLE );
if (res >= 0 && errors2.GetCount() == 0 && output2.GetCount() > 0)
{
tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..."
int pos = tmp.Find( wxT('.') );
- if (pos != -1)
- tmp.Remove( (size_t)pos, tmp.Len()-(size_t)pos );
+ if (pos != wxNOT_FOUND)
+ tmp.Remove( (size_t)pos, tmp.length()-(size_t)pos );
wxStringTokenizer tok2( tmp, wxT(" ") );
tmp = tok2.GetNextToken(); // "printer"
tmp = tok2.GetNextToken(); // "hp_deskjet930c"
- tmp = wxT("");
+ tmp = wxEmptyString;
while (tok2.HasMoreTokens())
{
tmp += tok2.GetNextToken();
item.SetText( tmp );
m_printerListCtrl->SetItem( item );
}
-
+
item.SetColumn( 1 );
item.SetId( 1+ item.GetId() );
}
}
-
+
printer_sizer->Add( m_printerListCtrl, 0, wxALL|wxGROW, 5 );
wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
- wxString strs6[] =
+ wxString strs6[] =
{
- _("Portrait"),
+ _("Portrait"),
_("Landscape")
};
m_orientationRadioBox= new wxRadioBox( this, wxPRINTID_ORIENTATION, _("Orientation"), wxDefaultPosition, wxDefaultSize, 2, strs6, 1, wxRA_SPECIFY_ROWS );
item2->Add( m_orientationRadioBox, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- wxStaticBox *item8 = new wxStaticBox( this, -1, _("Options") );
+ wxStaticBox *item8 = new wxStaticBox( this, wxID_ANY, _("Options") );
wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxHORIZONTAL );
m_colourCheckBox = new wxCheckBox( this, wxPRINTID_PRINTCOLOUR, _("Print in colour") );
// spooling options (on the right)
- wxStaticBox *item11 = new wxStaticBox( this, -1, _("Print spooling") );
+ wxStaticBox *item11 = new wxStaticBox( this, wxID_ANY, _("Print spooling") );
wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL );
- wxStaticText *item12 = new wxStaticText( this, -1, _("Printer command:") );
+ wxStaticText *item12 = new wxStaticText( this, wxID_ANY, _("Printer command:") );
item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
item13->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
- m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxT(""), wxDefaultPosition, wxSize(160,-1) );
+ m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 );
item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 );
- wxStaticText *item15 = new wxStaticText( this, -1, _("Printer options:") );
+ wxStaticText *item15 = new wxStaticText( this, wxID_ANY, _("Printer options:") );
item10->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxBoxSizer *item16 = new wxBoxSizer( wxHORIZONTAL );
item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
- m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxT(""), wxDefaultPosition, wxSize(160,-1) );
+ m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
item16->Add( m_printerOptionsText, 0, wxALIGN_CENTER|wxALL, 5 );
item10->Add( item16, 0, wxALIGN_CENTER|wxALL, 0 );
#if wxUSE_STATLINE
// static line
- main_sizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+ main_sizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
#endif
// buttons
- main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxCENTER|wxALL, 10 );
+ main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|wxALL, 10 );
SetAutoLayout( true );
SetSizer( main_sizer );
void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event)
{
// Delete check mark
- long item;
- for (item = 0; item < m_printerListCtrl->GetItemCount(); item++)
+ for (long item = 0; item < m_printerListCtrl->GetItemCount(); item++)
m_printerListCtrl->SetItemImage( item, -1 );
-
+
m_printerListCtrl->SetItemImage( event.GetIndex(), 0 );
-
+
if (event.GetIndex() == 0)
{
m_printerCommandText->SetValue( wxT("lpr") );
}
else
{
- wxString tmp = wxT("lpr -P");
- wxListItem item;
- item.SetColumn( 1 );
- item.SetMask( wxLIST_MASK_TEXT );
- item.SetId( event.GetIndex() );
- m_printerListCtrl->GetItem( item );
- tmp += item.GetText();
- m_printerCommandText->SetValue( tmp );
+ wxListItem li;
+ li.SetColumn( 1 );
+ li.SetMask( wxLIST_MASK_TEXT );
+ li.SetId( event.GetIndex() );
+ m_printerListCtrl->GetItem( li );
+ m_printerCommandText->SetValue( wxT("lpr -P") + li.GetText() );
}
}
bool wxGenericPrintSetupDialog::TransferDataToWindow()
{
- wxPostScriptPrintNativeData *data =
+ wxPostScriptPrintNativeData *data =
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
- if (m_printerCommandText && data->GetPrinterCommand())
+ if (m_printerCommandText && !data->GetPrinterCommand().empty())
m_printerCommandText->SetValue(data->GetPrinterCommand());
- if (m_printerOptionsText && data->GetPrinterOptions())
+ if (m_printerOptionsText && !data->GetPrinterOptions().empty())
m_printerOptionsText->SetValue(data->GetPrinterOptions());
if (m_colourCheckBox)
m_colourCheckBox->SetValue(m_printData.GetColour());
bool wxGenericPrintSetupDialog::TransferDataFromWindow()
{
- wxPostScriptPrintNativeData *data =
+ wxPostScriptPrintNativeData *data =
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
// find selected printer
long id = m_printerListCtrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
if (id == 0)
{
- m_printData.SetPrinterName( wxT("") );
+ m_printData.SetPrinterName( wxEmptyString );
}
else
{
// Generic page setup dialog
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase)
-BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
+BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase)
EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
END_EVENT_TABLE()
-void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
-{
- // We no longer query GetPrintMode, so we can eliminate the need
- // to call SetPrintMode.
- // This has the limitation that we can't explicitly call the PostScript
- // print setup dialog from the generic Page Setup dialog under Windows,
- // but since this choice would only happen when trying to do PostScript
- // printing under Windows (and only in 16-bit Windows which
- // doesn't have a Windows-specific page setup dialog) it's worth it.
-
- // First save the current settings, so the wxPrintData object is up to date.
- TransferDataFromWindow();
-
- // Transfer the current print settings from this dialog to the page setup dialog.
-
-#if 0
- // Use print factory later
-
- wxPrintDialogData data;
- data = GetPageSetupData().GetPrintData();
- data.SetSetupDialog(true);
- wxPrintDialog printDialog(this, & data);
- printDialog.ShowModal();
-
- // Transfer the page setup print settings from the page dialog to this dialog again, in case
- // the page setup dialog changed something.
- GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData();
- GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData
-
- // Now update the dialog in case the page setup dialog changed some of our settings.
- TransferDataToWindow();
-#endif
-}
-
wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
- wxPageSetupData* data)
- : wxDialog( parent,
+ wxPageSetupDialogData* data)
+ : wxPageSetupDialogBase( parent,
wxID_ANY,
_("Page Setup"),
- wxPoint(0, 0),
+ wxPoint(0,0),
wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
{
// 6) buttons
wxSizer* buttonsizer = CreateButtonSizer( wxOK|wxCANCEL);
- m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") );
- buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 );
- if ( !m_pageData.GetEnablePrinter() )
- m_printerButton->Enable(false);
+
+ if (wxPrintFactory::GetFactory()->HasPrintSetupDialog())
+ {
+ m_printerButton = new wxButton(this, wxPRINTID_SETUP, _("Printer...") );
+ buttonsizer->Add( m_printerButton, 0, wxLEFT|wxRIGHT, 10 );
+ if ( !m_pageData.GetEnablePrinter() )
+ m_printerButton->Enable(false);
+ }
+ else
+ {
+ m_printerButton = NULL;
+ }
+
// if (m_printData.GetEnableHelp())
// wxButton *helpButton = new wxButton(this, (wxFunction)wxGenericPageSetupHelpProc, _("Help"), wxDefaultCoord, wxDefaultCoord, buttonWidth, buttonHeight);
- mainsizer->Add( buttonsizer, 0, wxCENTER|wxALL, 10 );
+ mainsizer->Add( buttonsizer, 0, wxEXPAND|wxALL, 10 );
SetAutoLayout( true );
{
}
+wxPageSetupDialogData& wxGenericPageSetupDialog::GetPageSetupDialogData()
+{
+ return m_pageData;
+}
+
bool wxGenericPageSetupDialog::TransferDataToWindow()
{
if (m_marginLeftText)
return choice;
}
+void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
+{
+ // We no longer query GetPrintMode, so we can eliminate the need
+ // to call SetPrintMode.
+ // This has the limitation that we can't explicitly call the PostScript
+ // print setup dialog from the generic Page Setup dialog under Windows,
+ // but since this choice would only happen when trying to do PostScript
+ // printing under Windows (and only in 16-bit Windows which
+ // doesn't have a Windows-specific page setup dialog) it's worth it.
+
+ // First save the current settings, so the wxPrintData object is up to date.
+ TransferDataFromWindow();
+
+ // Transfer the current print settings from this dialog to the page setup dialog.
+
+#if 0
+ // Use print factory later
+
+ wxPrintDialogData data;
+ data = GetPageSetupData().GetPrintData();
+ data.SetSetupDialog(true);
+ wxPrintDialog printDialog(this, & data);
+ printDialog.ShowModal();
+
+ // Transfer the page setup print settings from the page dialog to this dialog again, in case
+ // the page setup dialog changed something.
+ GetPageSetupData().GetPrintData() = printDialog.GetPrintDialogData().GetPrintData();
+ GetPageSetupData().CalculatePaperSizeFromId(); // Make sure page size reflects the id in wxPrintData
+
+ // Now update the dialog in case the page setup dialog changed some of our settings.
+ TransferDataToWindow();
#endif
+}
+#endif
projects / wxWidgets.git / blobdiff