[gtkmm: 9/10] Adapt to more Gdk changes

[Kjell Ahlstedt <kjellahl src gnome org>]

commit b0396aef75bcdf0aaaff44e433f95cf3dc62672f
Author: Andreas Persson <andreasp56 outlook com>
Date:   Thu Jul 30 21:00:41 2020 +0200

    Adapt to more Gdk changes

 gdk/src/device.ccg |  2 --
 gdk/src/device.hg  | 22 ----------------------
 gdk/src/seat.hg    |  4 ++--
 3 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/gdk/src/device.ccg b/gdk/src/device.ccg
index 5579c9f5..0517c911 100644
--- a/gdk/src/device.ccg
+++ b/gdk/src/device.ccg
@@ -23,8 +23,6 @@
 #include <gdkmm/seat.h>
 #include <gdkmm/surface.h>
 
-using Type = Gdk::Device::Type;
-
 namespace Gdk
 {
 
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index 2e72bc39..65f136b5 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -15,7 +15,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <vector>
 #include <pangomm/context.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/enums.h>
@@ -48,25 +47,14 @@ protected:
   _CTOR_DEFAULT()
 
 public:
-  _WRAP_ENUM(Type, GdkDeviceType, decl_prefix GDKMM_API)
-
   _WRAP_METHOD(Glib::ustring get_name() const, gdk_device_get_name)
   _WRAP_METHOD(bool get_has_cursor() const, gdk_device_get_has_cursor)
 
   _WRAP_METHOD(InputSource get_source() const, gdk_device_get_source)
 
-#m4 _CONVERSION(`GList*',`std::vector<Glib::RefPtr<Gdk::Device> 
> ',`Glib::ListHandler<Glib::RefPtr<Gdk::Device> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<Gdk::Device> > list_physical_devices(), 
gdk_device_list_physical_devices)
-  //TODO:_WRAP_METHOD(std::vector<Glib::RefPtr<const Gdk::Device> > list_physical_devices() const, 
gdk_device_list_physical_devices, constversion)
-
   _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_device_get_display, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_device_get_display, refreturn, 
constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<Device> get_associated_device(), gdk_device_get_associated_device, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Device> get_associated_device() const, gdk_device_get_associated_device, 
refreturn, constversion)
-
-  _WRAP_METHOD(Type get_device_type() const, gdk_device_get_device_type)
-
   _WRAP_METHOD(Glib::RefPtr<Surface> get_surface_at_position(double& win_x, double& win_y),
     gdk_device_get_surface_at_position, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Surface> get_surface_at_position(double& win_x, double& win_y) const,
@@ -75,10 +63,6 @@ public:
   /** Obtains the surface underneath the device.
    * Returns an empty RefPtr if the surface tree under the device is not known to GDK (for example, belongs 
to another application).
    *
-   * As a slave device coordinates are those of its master pointer, This
-   * function may not be called on devices of type Gdk::Device::Type::SLAVE,
-   * unless there is an ongoing grab on them. See grab().
-   *
    * @newin{3,0}
    *
    * @return The Gdk::Surface under the device position.
@@ -88,10 +72,6 @@ public:
   /** Obtains the surface underneath the device.
    * Returns an empty RefPtr if the surface tree under the device is not known to GDK (for example, belongs 
to another application).
    *
-   * As a slave device coordinates are those of its master pointer, This
-   * function may not be called on devices of type Gdk::Device::Type::SLAVE,
-   * unless there is an ongoing grab on them. See grab().
-   *
    * @newin{3,0}
    *
    * @return The Gdk::Surface under the device position.
@@ -153,8 +133,6 @@ public:
 
   _WRAP_PROPERTY("display", Glib::RefPtr<Display>, newin "3,22")
   _WRAP_PROPERTY("name", Glib::ustring, newin "3,22")
-  _WRAP_PROPERTY("type", Type, newin "3,22")
-  _WRAP_PROPERTY("associated-device", Glib::RefPtr<Device>, newin "3,22")
   _WRAP_PROPERTY("source", InputSource, newin "3,22")
   _WRAP_PROPERTY("has-cursor", bool, newin "3,22")
   _WRAP_PROPERTY("n-axes", guint, newin "3,22")
diff --git a/gdk/src/seat.hg b/gdk/src/seat.hg
index 859eb5d7..c79a0e7a 100644
--- a/gdk/src/seat.hg
+++ b/gdk/src/seat.hg
@@ -49,9 +49,9 @@ public:
   _WRAP_METHOD(Capabilities get_capabilities() const, gdk_seat_get_capabilities)
 
 #m4 
_CONVERSION(`GList*',`std::vector<Glib::RefPtr<Device>>',`Glib::ListHandler<Glib::RefPtr<Device>>::list_to_vector($3,
 Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<Device>> get_physical_devices(Capabilities capabilities), 
gdk_seat_get_physical_devices)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<Device>> get_devices(Capabilities capabilities), 
gdk_seat_get_devices)
 #m4 _CONVERSION(`GList*',`std::vector<Glib::RefPtr<const Device>>',`Glib::ListHandler<Glib::RefPtr<const 
Device>>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<const Device>> get_physical_devices(Capabilities capabilities) 
const, gdk_seat_get_physical_devices)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<const Device>> get_devices(Capabilities capabilities) const, 
gdk_seat_get_devices)
 
   _WRAP_METHOD(Glib::RefPtr<Device> get_pointer(), gdk_seat_get_pointer, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Device> get_pointer() const, gdk_seat_get_pointer, refreturn, constversion)