X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dac27ad48765b2a54ba4b1d0554a20d21d93353..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/generic/prntdlgg.cpp?ds=inline diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index 110cb87ea3..48733bdd22 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -62,16 +62,20 @@ #include #include +#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) + #include "wx/link.h" + wxFORCE_LINK_MODULE(gtk_print) #endif +#endif // !wxUniv + // ---------------------------------------------------------------------------- // global vars // ---------------------------------------------------------------------------- @@ -141,7 +145,7 @@ END_EVENT_TABLE() wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintDialogData* data) - : wxPrintDialogBase(GetParentForModalDialog(parent), + : wxPrintDialogBase(GetParentForModalDialog(parent, 0), wxID_ANY, _("Print"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE | @@ -155,7 +159,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintData* data) - : wxPrintDialogBase(GetParentForModalDialog(parent), + : wxPrintDialogBase(GetParentForModalDialog(parent, 0), wxID_ANY, _("Print"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE | @@ -204,9 +208,9 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent)) if (factory->HasStatusLine()) { flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ), - 0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 ); + 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 ); flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ), - 0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 ); + 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 ); } mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 ); @@ -217,16 +221,15 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent)) 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 ); @@ -353,14 +356,16 @@ bool wxGenericPrintDialog::TransferDataToWindow() 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 { @@ -375,7 +380,7 @@ bool wxGenericPrintDialog::TransferDataToWindow() } } 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()); @@ -453,13 +458,13 @@ wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxD } /* XPM */ -static const 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 */ " ", " ", @@ -703,7 +708,7 @@ void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event) li.SetMask( wxLIST_MASK_TEXT ); li.SetId( event.GetIndex() ); m_printerListCtrl->GetItem( li ); - m_printerCommandText->SetValue( _T("lpr -P") + li.GetText() ); + m_printerCommandText->SetValue( wxT("lpr -P") + li.GetText() ); } } @@ -799,7 +804,7 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice() wxComboBox *choice = new wxComboBox( this, wxPRINTID_PAPERSIZE, - _("Paper Size"), + _("Paper size"), wxDefaultPosition, wxSize(width, wxDefaultCoord), n, choices ); @@ -826,7 +831,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, wxPageSetupDialogData* data) : wxPageSetupDialogBase( parent, wxID_ANY, - _("Page Setup"), + _("Page setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL ) @@ -853,7 +858,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, m_paperTypeChoice = new wxComboBox( this, wxPRINTID_PAPERSIZE, - _("Paper Size"), + _("Paper size"), wxDefaultPosition, wxSize(300, wxDefaultCoord), n, choices ); @@ -1055,7 +1060,7 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) wxComboBox *choice = new wxComboBox( this, wxPRINTID_PAPERSIZE, - _("Paper Size"), + _("Paper size"), wxPoint(*x, *y), wxSize(300, wxDefaultCoord), n, choices );