Kaydet (Commit) 2f6ffa78 authored tarafından Caolán McNamara's avatar Caolán McNamara

tweak gtk print stuff to build against an archaic gtk2

üst f7aac5d4
...@@ -452,10 +452,16 @@ GtkPrintDialog::impl_initDialog() ...@@ -452,10 +452,16 @@ GtkPrintDialog::impl_initDialog()
} }
m_pWrapper->print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(m_pDialog), m_pWrapper->print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(m_pDialog),
GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES
// GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS | | GTK_PRINT_CAPABILITY_COLLATE
GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PS | | GTK_PRINT_CAPABILITY_REVERSE
GTK_PRINT_CAPABILITY_NUMBER_UP | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT | 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 ...@@ -805,9 +811,11 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled
ePrintPages = GTK_PRINT_PAGES_RANGES; ePrintPages = GTK_PRINT_PAGES_RANGES;
break; break;
case 2: case 2:
#if GTK_CHECK_VERSION(2,14,0)
if (m_pWrapper->supportsPrintSelection()) if (m_pWrapper->supportsPrintSelection())
ePrintPages = GTK_PRINT_PAGES_SELECTION; ePrintPages = GTK_PRINT_PAGES_SELECTION;
else else
#endif
SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it"); SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it");
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment