X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa034c4511b0b3e9d7cfc9eb170ed063be92ca90..5a2c086adf6d7c6bba22fcbd57b0958fdc5723a0:/src/generic/prntdlgg.cpp diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index 02f1434937..c869dd68a1 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -62,6 +62,8 @@ #include #include +#ifndef __WXUNIVERSAL__ + #if wxUSE_LIBGNOMEPRINT #include "wx/link.h" wxFORCE_LINK_MODULE(gnome_print) @@ -72,6 +74,8 @@ wxFORCE_LINK_MODULE(gtk_print) #endif +#endif // !wxUniv + // ---------------------------------------------------------------------------- // global vars // ---------------------------------------------------------------------------- @@ -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 ); @@ -357,10 +361,12 @@ bool wxGenericPrintDialog::TransferDataToWindow() 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 {