diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2015-10-12 22:13:37 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-14 08:09:40 +0000 |
| commit | 068c04fb06806a9345c0059545d19a416d7e60b7 (patch) | |
| tree | 0a0790e03929f9e862baf9347dbe76fc10661c1e /vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | |
| parent | a69a786b91048d69bbb47503e3720de613935e56 (diff) | |
Bump gtk+ version to 2.18
2.18 is the version available in RHEL 6 released in 2010.
Change-Id: I4cd4fc89f6b51e6f58ca72b8182f80316b1f4f88
Reviewed-on: https://gerrit.libreoffice.org/19330
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx')
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 31 |
1 files changed, 13 insertions, 18 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 |