summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/objects.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/dialog/objects.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/dialog/objects.cpp')
-rw-r--r--src/ui/dialog/objects.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 2be1f115f..6d2e884b0 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -779,7 +779,13 @@ bool ObjectsPanel::_handleButtonEvent(GdkEventButton* event)
int y = static_cast<int>(event->y);
if ( _tree.get_path_at_pos( x, y, path ) ) {
_checkTreeSelection();
+
+#if GTKMM_CHECK_VERSION(3,22,0)
+ _popupMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
+#else
_popupMenu.popup(event->button, event->time);
+#endif
+
if (_tree.get_selection()->is_selected(path)) {
return true;
}