X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f69fc95c93a7c300a39dced01f39d6659d4a7456..65aeaf19f6781193697d28f868901a80ee623396:/src/generic/prntdlgg.cpp diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index 2f97543631..3270cfddaa 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: prntdlgg.cpp +// Name: src/generic/prntdlgg.cpp // Purpose: Generic print dialogs // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // 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" @@ -30,6 +26,8 @@ #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" @@ -47,11 +45,9 @@ #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 @@ -66,6 +62,11 @@ #include #include +#if wxUSE_LIBGNOMEPRINT + #include "wx/link.h" + wxFORCE_LINK_MODULE(gnome_print) +#endif + // ---------------------------------------------------------------------------- // global vars // ---------------------------------------------------------------------------- @@ -136,7 +137,7 @@ END_EVENT_TABLE() wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintDialogData* data) : wxPrintDialogBase(parent, wxID_ANY, _("Print"), - wxPoint(0, 0), wxSize(600, 600), + wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL) { @@ -149,7 +150,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintData* data) : wxPrintDialogBase(parent, wxID_ANY, _("Print"), - wxPoint(0, 0), wxSize(600, 600), + wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL) { @@ -161,7 +162,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *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 ); @@ -245,14 +246,11 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent)) 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 + // 4) buttons - // 5) buttons - - mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|wxALL, 10 ); + wxSizer *sizerBtn = CreateSeparatedButtonSizer( wxOK|wxCANCEL); + if ( sizerBtn ) + mainsizer->Add(sizerBtn, 0, wxEXPAND|wxALL, 10 ); SetAutoLayout( true ); SetSizer( mainsizer ); @@ -294,7 +292,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) wxFileName fname( m_printDialogData.GetPrintData().GetFilename() ); wxFileDialog dialog( this, _("PostScript file"), - fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxSAVE | 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() ); @@ -442,13 +440,13 @@ BEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog) 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 * check_xpm[] = { /* width height ncolors chars_per_pixel */ "16 16 3 1", /* colors */ @@ -513,6 +511,8 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data) 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() ); @@ -533,8 +533,8 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data) 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 ) ); @@ -549,6 +549,8 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data) 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 "); @@ -561,7 +563,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data) tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..." int pos = tmp.Find( wxT('.') ); if (pos != wxNOT_FOUND) - tmp.Remove( (size_t)pos, tmp.Len()-(size_t)pos ); + tmp.Remove( (size_t)pos, tmp.length()-(size_t)pos ); wxStringTokenizer tok2( tmp, wxT(" ") ); tmp = tok2.GetNextToken(); // "printer" tmp = tok2.GetNextToken(); // "hp_deskjet930c" @@ -678,8 +680,7 @@ wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog() 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 ); @@ -690,14 +691,12 @@ void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event) } 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( _T("lpr -P") + li.GetText() ); } } @@ -821,7 +820,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, : wxPageSetupDialogBase( parent, wxID_ANY, _("Page Setup"), - wxPoint(0, 0), + wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL ) { @@ -1095,4 +1094,3 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) } #endif -