[gtkmm] Gdk::Device: Change DeviceType to Cursor::Type.

[Murray Cumming <murrayc src gnome org>]

commit dd610ad9786a7847a62cf81793cbe024e978b94d
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 14:06:42 2017 +0200

    Gdk::Device: Change DeviceType to Cursor::Type.

 gdk/src/device.ccg      |    2 ++
 gdk/src/device.hg       |    6 +++---
 tools/m4/convert_gdk.m4 |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gdk/src/device.ccg b/gdk/src/device.ccg
index 49925b1..e9c17c0 100644
--- a/gdk/src/device.ccg
+++ b/gdk/src/device.ccg
@@ -21,6 +21,8 @@
 #include <gdkmm/seat.h>
 #include <gdkmm/window.h>
 
+using Type = Gdk::Device::Type;
+
 namespace Gdk
 {
 
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index c866b14..e8047de 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -34,7 +34,6 @@ namespace Gdk
 _WRAP_ENUM(EventMask, GdkEventMask)
 _WRAP_ENUM(InputMode, GdkInputMode)
 _WRAP_ENUM(InputSource, GdkInputSource)
-_WRAP_ENUM(DeviceType, GdkDeviceType)
 //_WRAP_ENUM(GrabOwnership, GdkGrabOwnership)
 _WRAP_ENUM(GrabStatus, GdkGrabStatus)
 
@@ -52,6 +51,7 @@ protected:
   _CTOR_DEFAULT()
 
 public:
+  _WRAP_ENUM(Type, GdkDeviceType)
 
   _WRAP_METHOD(Glib::ustring get_name() const, gdk_device_get_name)
   _WRAP_METHOD(bool get_has_cursor() const, gdk_device_get_has_cursor)
@@ -103,7 +103,7 @@ public:
   _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(DeviceType get_device_type() const, gdk_device_get_device_type)
+  _WRAP_METHOD(Type get_device_type() const, gdk_device_get_device_type)
 
    _IGNORE(gdk_device_grab, gdk_device_ungrab)dnl//deprecated
 
@@ -211,7 +211,7 @@ public:
   // be used outside gtk+.
   _WRAP_PROPERTY("display", Glib::RefPtr<Display>, newin "3,22")
   _WRAP_PROPERTY("name", Glib::ustring, newin "3,22")
-  _WRAP_PROPERTY("type", DeviceType, newin "3,22")
+  _WRAP_PROPERTY("type", Type, newin "3,22")
   _WRAP_PROPERTY("associated-device", Glib::RefPtr<Device>, newin "3,22")
   _WRAP_PROPERTY("input-source", InputSource, newin "3,22")
   _WRAP_PROPERTY("input-mode", InputMode, newin "3,22")
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 85b37c4..83f82b9 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -32,7 +32,7 @@ _CONV_ENUM(Gdk,ByteOrder)
 _CONV_ENUM(Gdk,CapStyle)
 _CONV_ENUM(Gdk,Colorspace)
 _CONV_INCLASS_ENUM(Gdk,Cursor,Type)
-_CONV_ENUM(Gdk,DeviceType)
+_CONV_INCLASS_ENUM(Gdk,Device,Type)
 _CONV_ENUM(Gdk,DragAction)
 _CONV_ENUM(Gdk,DragProtocol)
 _CONV_ENUM(Gdk,EventMask)