summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/tool-base.cpp
diff options
context:
space:
mode:
authorJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-12-27 17:05:55 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-12-27 17:05:55 +0000
commit76aab6da8d642a2e72c0a8e0f38c6994a6e62b35 (patch)
tree047c4f9d208f8cf8b647acec494a2bb7a5d160ec /src/ui/tools/tool-base.cpp
parentMerge branch 'master' into powerpencilII (diff)
parentStop using deprecated gtk_adjustment_value_changed (diff)
downloadinkscape-76aab6da8d642a2e72c0a8e0f38c6994a6e62b35.tar.gz
inkscape-76aab6da8d642a2e72c0a8e0f38c6994a6e62b35.zip
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/ui/tools/tool-base.cpp')
-rw-r--r--src/ui/tools/tool-base.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 79e1cbc10..83a084a60 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -1126,10 +1126,15 @@ void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event)
switch (event->type) {
case GDK_BUTTON_PRESS:
+#if GTKMM_CHECK_VERSION(3,22,0)
+ case GDK_KEY_PRESS:
+ CM->popup_at_pointer(event);
+#else
CM->popup(event->button.button, event->button.time);
break;
case GDK_KEY_PRESS:
CM->popup(0, event->key.time);
+#endif
break;
default:
break;