From 630be8274013c5eef5f19e19a14bc6d759aada5a Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Sun, 26 May 2019 16:11:07 +0100 Subject: Rm unused code now Gtk+ >= 3.22 dependency is set --- src/desktop-events.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/desktop-events.cpp') diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index e35cd2aba..a87c2ac10 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -19,12 +19,9 @@ #include "desktop-events.h" #include +#include + #include -#if GTK_CHECK_VERSION(3, 20, 0) -# include -#else -# include -#endif #include @@ -113,7 +110,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) if (event->button.button == 1) { drag_type = SP_DRAG_NONE; sp_event_context_discard_delayed_snap_event(desktop->event_context); - sp_canvas_item_ungrab(item, event->button.time); + sp_canvas_item_ungrab(item); Inkscape::UI::Dialogs::GuidelinePropertiesDialog::showDialog(guide, desktop); ret = TRUE; } @@ -327,7 +324,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) desktop->set_coordinate_status(event_dt); } drag_type = SP_DRAG_NONE; - sp_canvas_item_ungrab(item, event->button.time); + sp_canvas_item_ungrab(item); ret=TRUE; } break; @@ -431,14 +428,8 @@ static void init_extended() { Glib::ustring avoidName("pad"); auto display = Gdk::Display::get_default(); - -#if GTK_CHECK_VERSION(3, 20, 0) auto seat = display->get_default_seat(); auto const devices = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL); -#else - auto dm = display->get_device_manager(); - auto const devices = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE); -#endif if ( !devices.empty() ) { for (auto const dev : devices) { -- cgit v1.2.3