diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-01-30 13:24:19 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-30 13:25:15 +0000 |
commit | 2f6ffa789b2fbd33f7fe1eac0512f6699ed1087f (patch) | |
tree | 1240810bea9ec70c6a3ad8d8fb801aaab6ae5d9f /vcl | |
parent | sal: add sw.rtf log area (diff) | |
download | core-2f6ffa789b2fbd33f7fe1eac0512f6699ed1087f.tar.gz core-2f6ffa789b2fbd33f7fe1eac0512f6699ed1087f.zip |
tweak gtk print stuff to build against an archaic gtk2
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/gtk/gdi/salprn-gtk.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 8351575191d8..587a75492fb3 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -452,10 +452,16 @@ GtkPrintDialog::impl_initDialog() } m_pWrapper->print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(m_pDialog), - GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | -// GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_NUMBER_UP | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT + GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES + | GTK_PRINT_CAPABILITY_COLLATE + | GTK_PRINT_CAPABILITY_REVERSE + | GTK_PRINT_CAPABILITY_GENERATE_PS +#if GTK_CHECK_VERSION(2,12,0) + | GTK_PRINT_CAPABILITY_NUMBER_UP +#endif +#if GTK_CHECK_VERSION(2,14,0) + | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT +#endif )); } @@ -805,9 +811,11 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled ePrintPages = GTK_PRINT_PAGES_RANGES; break; case 2: +#if GTK_CHECK_VERSION(2,14,0) if (m_pWrapper->supportsPrintSelection()) ePrintPages = GTK_PRINT_PAGES_SELECTION; else +#endif SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it"); break; default: |