--- gigedit/trunk/src/gigedit/regionchooser.cpp 2019/01/31 19:42:50 3459 +++ gigedit/trunk/src/gigedit/regionchooser.cpp 2019/02/02 07:48:50 3460 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2017 Andreas Persson + * Copyright (C) 2006-2019 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -674,7 +674,7 @@ # if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 20) Glib::wrap(event->device, true)->ungrab(event->time); # else - gdk_device_ungrab(Glib::wrap(event->device, true)->gobj(), event->time); + Glib::wrap(event->device, true)->get_seat()->ungrab(); # endif #endif resize.active = false; @@ -690,7 +690,7 @@ # if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 20) Glib::wrap(event->device, true)->ungrab(event->time); # else - gdk_device_ungrab(Glib::wrap(event->device, true)->gobj(), event->time); + Glib::wrap(event->device, true)->get_seat()->ungrab(); # endif #endif move.active = false; @@ -814,18 +814,15 @@ Gdk::Cursor::create(Gdk::SB_H_DOUBLE_ARROW), event->time); # else - gdk_device_grab( - Glib::wrap(event->device, true)->gobj(), - get_window()->gobj(), - GDK_OWNERSHIP_NONE, + Glib::wrap(event->device, true)->get_seat()->grab( + get_window(), + Gdk::SeatCapabilities::SEAT_CAPABILITY_ALL_POINTING, false, - GdkEventMask(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK), Gdk::Cursor::create( Glib::wrap(event->device, true)->get_seat()->get_display(), Gdk::SB_H_DOUBLE_ARROW - )->gobj(), - event->time + ), + reinterpret_cast(event) ); # endif #endif @@ -856,18 +853,15 @@ Gdk::Cursor::create(Gdk::FLEUR), event->time); # else - gdk_device_grab( - Glib::wrap(event->device, true)->gobj(), - get_window()->gobj(), - GDK_OWNERSHIP_NONE, + Glib::wrap(event->device, true)->get_seat()->grab( + get_window(), + Gdk::SeatCapabilities::SEAT_CAPABILITY_ALL_POINTING, false, - GdkEventMask(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK), Gdk::Cursor::create( Glib::wrap(event->device, true)->get_seat()->get_display(), Gdk::FLEUR - )->gobj(), - event->time + ), + reinterpret_cast(event) ); # endif #endif