diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2015-06-23 18:37:11 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-24 11:12:31 +0000 |
commit | 25befc0a1b1448527c645ed1963b4f29d3126a53 (patch) | |
tree | 4a28549a431cbc20ee5c9097a95f140c63bed01e /vcl | |
parent | 5427d69fa05dd118eb2160999cf6f2a6a6097886 (diff) |
GtkSettings:gtk-menu-popup-delay deprecated
I took example from https://mail.gnome.org/archives/commits-list/2013-June/msg06434.html
Change-Id: I5fb090c3245848c92238f34259f1a2f77f9080c7
Reviewed-on: https://gerrit.libreoffice.org/16432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 203ca4c83620..bd557a49c936 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, iMenuPopupDelay; + int iDoubleClickTime, iDoubleClickDistance, iDragThreshold; + static const int MENU_POPUP_DELAY = 225; 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( iMenuPopupDelay ); + aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY ); rSettings.SetMouseSettings( aMouseSettings ); gboolean showmenuicons = true, primarybuttonwarps = false; diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index a0afcd6ccc72..754991014ae4 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1724,19 +1724,19 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetCursorBlinkTime( STYLE_CURSOR_NOBLINKTIME ); MouseSettings aMouseSettings = rSettings.GetMouseSettings(); - int iDoubleClickTime, iDoubleClickDistance, iDragThreshold, iMenuPopupDelay; + int iDoubleClickTime, iDoubleClickDistance, iDragThreshold; + static const int MENU_POPUP_DELAY = 225; 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( iMenuPopupDelay ); + aMouseSettings.SetMenuDelay( MENU_POPUP_DELAY ); rSettings.SetMouseSettings( aMouseSettings ); gboolean showmenuicons = true, primarybuttonwarps = false; |