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

[Caolán McNamara]

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

New commits:
commit 010775e037cd09c3a0fd7bad0bed6b881205e9dd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 30 17:02:07 2015 +0000

    gtk3: scroll lock only available in >= 3.18.0
    
    Change-Id: I1c22873c7dc989637ef4d12bf5a08395383e3779
    (cherry picked from commit 4d3c91ee82de53589924ca72c22a745ffba6e6af)

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 4a9fa43..3b39a3c 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2794,8 +2794,10 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState()
         nState |= KeyIndicatorState::CAPSLOCK;
     if (gdk_keymap_get_num_lock_state(pKeyMap))
         nState |= KeyIndicatorState::NUMLOCK;
+#if GTK_CHECK_VERSION(3,18,0)
     if (gdk_keymap_get_scroll_lock_state(pKeyMap))
         nState |= KeyIndicatorState::SCROLLLOCK;
+#endif
 
     return nState;
 #endif