vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8ed4cb7429db6f9c37af166d1643c669c6b5723c
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jun 25 20:29:51 2015 +0100
gtk-menu-popup-delay only deprecated in gtk3 I think
Change-Id: I4bf77a912296f2d4a14c8bedf6b6bed6b52f9023
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index bd557a4..203ca4c 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
