summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/panel.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/widget/panel.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/widget/panel.cpp')
-rw-r--r--src/ui/widget/panel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index aea9b7e8e..cc17262af 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -83,7 +83,11 @@ void Panel::_popper(GdkEventButton* event)
{
if ( (event->type == GDK_BUTTON_PRESS) && (event->button == 3 || event->button == 1) ) {
if (_menu) {
+#if GTKMM_CHECK_VERSION(3,22,0)
+ _menu->popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
+#else
_menu->popup(event->button, event->time);
+#endif
}
}
}