[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx

Caolán McNamara caolanm at redhat.com
Mon Feb 15 11:02:17 UTC 2016


 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 550b70e6a3a241710cdda3313d46721a5e0bdf17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 12 21:05:23 2016 +0000

    gtk3: only available since 3.12.0
    
    (cherry picked from commit 2b60321b21ff9ada64576f5711950b616b8a25ba)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    
    Change-Id: I23a9907fa0ec3258afdb69285f31b6ce5a3521a0

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index d73a036..5205d13 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2002,6 +2002,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     ::Color aHighlightTextColor = getColor( color );
     aStyleSet.SetMenuHighlightTextColor( aHighlightTextColor );
 
+#if GTK_CHECK_VERSION(3, 12, 0)
     // hyperlink colors
     gtk_style_context_set_state(mpLinkButtonStyle, GTK_STATE_FLAG_LINK);
     gtk_style_context_get_color(mpLinkButtonStyle, gtk_style_context_get_state(mpLinkButtonStyle), &text_color);
@@ -2009,6 +2010,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     gtk_style_context_set_state(mpLinkButtonStyle, GTK_STATE_FLAG_VISITED);
     gtk_style_context_get_color(mpLinkButtonStyle, gtk_style_context_get_state(mpLinkButtonStyle), &text_color);
     aStyleSet.SetVisitedLinkColor(getColor(text_color));
+#endif
 
 #if GTK_CHECK_VERSION(3, 19, 2)
     {


More information about the Libreoffice-commits mailing list