diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-06-25 20:29:51 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-25 20:29:51 +0100 |
commit | 8ed4cb7429db6f9c37af166d1643c669c6b5723c (patch) | |
tree | b1b3d58cb1fdb1206086329a713252b29043933e | |
parent | c301d8c8fa1de36d8aae03cfa76772b537b10980 (diff) |
gtk-menu-popup-delay only deprecated in gtk3 I think
Change-Id: I4bf77a912296f2d4a14c8bedf6b6bed6b52f9023
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index bd557a49c936..203ca4c83620 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -4159,19 +4159,19 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetCursorBlinkTime( STYLE_CURSOR_NOBLINKTIME ); MouseSettings aMouseSettings = rSettings.GetMouseSettings(); - int iDoubleClickTime, iDoubleClickDistance, iDragThreshold; - static const int MENU_POPUP_DELAY = 225; + int iDoubleClickTime, iDoubleClickDistance, iDragThreshold, iMenuPopupDelay; g_object_get( pSettings, "gtk-double-click-time", &iDoubleClickTime, "gtk-double-click-distance", &iDoubleClickDistance, "gtk-dnd-drag-threshold", &iDragThreshold, + "gtk-menu-popup-delay", &iMenuPopupDelay, nullptr ); aMouseSettings.SetDoubleClickTime( iDoubleClickTime ); aMouseSettings.SetDoubleClickWidth( iDoubleClickDistance ); aMouseSettings.SetDoubleClickHeight( iDoubleClickDistance ); aMouseSettings.SetStartDragWidth( iDragThreshold ); aMouseSettings.SetStartDragHeight( iDragThreshold ); - aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY ); + aMouseSettings.SetMenuDelay( iMenuPopupDelay ); rSettings.SetMouseSettings( aMouseSettings ); gboolean showmenuicons = true, primarybuttonwarps = false; |