diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2016-08-08 23:57:01 +0000 |
|---|---|---|
| committer | Alex Henrie <alexhenrie24@gmail.com> | 2016-08-08 23:57:01 +0000 |
| commit | d975ffe7b06db18ba418207270f58ec79eb07ae1 (patch) | |
| tree | 79298575c0aa422d90fd87bde6a307c860796e4f /src/desktop-events.cpp | |
| parent | Remove deprecated Autotools and btool files. Please use CMake instead (diff) | |
| download | inkscape-d975ffe7b06db18ba418207270f58ec79eb07ae1.tar.gz inkscape-d975ffe7b06db18ba418207270f58ec79eb07ae1.zip | |
Use Gdk::Seat instead of Gdk::DeviceManager
(bzr r15046.1.1)
Diffstat (limited to 'src/desktop-events.cpp')
| -rw-r--r-- | src/desktop-events.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 1932a9864..5fef8cbfc 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -21,7 +21,12 @@ #include "ui/dialog/guides.h" #include "desktop-events.h" -#include <gdkmm/devicemanager.h> +#include <gdkmm/display.h> +#if GTK_CHECK_VERSION(3, 20, 0) +# include <gdkmm/seat.h> +#else +# include <gdkmm/devicemanager.h> +#endif #include <2geom/line.h> #include <2geom/angle.h> @@ -596,8 +601,13 @@ 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) { |