diff options
Diffstat (limited to 'vcl/unx/gtk/gdi')
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 31 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salprn-gtk.cxx | 14 |
2 files changed, 13 insertions, 32 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 8438e7642131..ff520abbdd36 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3155,7 +3155,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar( { const double shim = 0.2; -#if GTK_CHECK_VERSION(2,10,0) gint separator_height, separator_width, wide_separators = 0; gtk_widget_style_get (gWidgetData[m_nXScreen].gSeparator, @@ -3180,7 +3179,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar( w * (1 - 2*shim), separator_width); } else -#endif { if (nPart == PART_SEPARATOR_VERT) gtk_paint_vline (gWidgetData[m_nXScreen].gSeparator->style, gdkDrawable, @@ -4009,23 +4007,20 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetHighlightColor( aHighlightColor ); aStyleSet.SetHighlightTextColor( aHighlightTextColor ); - if( ! gtk_check_version( 2, 10, 0 ) ) // link colors came in with 2.10, avoid an assertion + // hyperlink colors + GdkColor *link_color = NULL; + gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL); + if (link_color) { - // hyperlink colors - GdkColor *link_color = NULL; - gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL); - if (link_color) - { - aStyleSet.SetLinkColor(getColor(*link_color)); - gdk_color_free (link_color); - link_color = NULL; - } - gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL); - if (link_color) - { - aStyleSet.SetVisitedLinkColor(getColor(*link_color)); - gdk_color_free (link_color); - } + aStyleSet.SetLinkColor(getColor(*link_color)); + gdk_color_free (link_color); + link_color = NULL; + } + gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL); + if (link_color) + { + aStyleSet.SetVisitedLinkColor(getColor(*link_color)); + gdk_color_free (link_color); } // Tab colors diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index d05f71b87a63..cf20b2c430eb 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -318,15 +318,9 @@ lcl_setHelpText( const uno::Sequence<OUString>& i_rHelpTexts, const sal_Int32 i_nIndex) { -#if GTK_CHECK_VERSION(2,12,0) if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength()) gtk_widget_set_tooltip_text(io_pWidget, OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); -#else - (void)io_pWidget; - (void)i_rHelpTexts; - (void)i_nIndex; -#endif } static GtkWidget* @@ -429,12 +423,8 @@ GtkPrintDialog::impl_initDialog() | 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 )); } @@ -787,11 +777,9 @@ 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_xWrapper->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: @@ -999,7 +987,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe } catch (...) {} } -#if GTK_CHECK_VERSION(2,17,5) if (gtk_print_unix_dialog_get_has_selection(GTK_PRINT_UNIX_DIALOG(m_pDialog))) { uno::Any aSelection; @@ -1022,7 +1009,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } -#endif uno::Sequence<beans::PropertyValue> aArgs(2); aArgs[0].Name = "FilterData"; aArgs[0].Value <<= aFilterData; |