[gtkmm] Gdk::Window: Change WindowType to Window::Type.

[Murray Cumming <murrayc src gnome org>]

commit 912435cd158332cdb659096ff85593b95030f643
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 17:36:13 2017 +0200

    Gdk::Window: Change WindowType to Window::Type.

 gdk/src/window.ccg      |    1 +
 gdk/src/window.hg       |    4 ++--
 tools/m4/convert_gdk.m4 |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdk/src/window.ccg b/gdk/src/window.ccg
index a530260..77fd71b 100644
--- a/gdk/src/window.ccg
+++ b/gdk/src/window.ccg
@@ -23,6 +23,7 @@
 #include <gdkmm/drawcontext.h>
 #include <gdkmm/drawingcontext.h>
 
+using Type = Gdk::Window::Type;
 using State = Gdk::Window::State;
 
 namespace Gdk
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 20d0c71..a28e689 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -34,7 +34,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gdk
 {
 
-_WRAP_ENUM(WindowType, GdkWindowType)
 _WRAP_ENUM(WindowHints, GdkWindowHints)
 _WRAP_ENUM(WindowTypeHint, GdkWindowTypeHint)
 _WRAP_ENUM(WMDecoration, GdkWMDecoration)
@@ -64,6 +63,7 @@ class Window : public Glib::Object
   _IGNORE(gdk_window_destroy, gdk_window_is_destroyed)
 
 public:
+  _WRAP_ENUM(Type, GdkWindowType)
   _WRAP_ENUM(State, GdkWindowState)
 
   // _WRAP_CREATE() would not be very useful here.
@@ -81,7 +81,7 @@ public:
   _WRAP_METHOD(static Glib::RefPtr<Window> create_input(const Glib::RefPtr<Window>& parent,
     EventMask event_mask, const Rectangle& position), gdk_window_new_input)
 
-  _WRAP_METHOD(WindowType get_window_type() const, gdk_window_get_window_type)
+  _WRAP_METHOD(Type get_window_type() const, gdk_window_get_window_type)
 
   _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_window_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_window_get_screen, refreturn, constversion)
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 98aa09f..c656a51 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -65,7 +65,7 @@ _CONV_ENUM(Gdk,WindowAttributesType)
 _CONV_ENUM(Gdk,WindowEdge)
 _CONV_ENUM(Gdk,WindowHints)
 _CONV_INCLASS_ENUM(Gdk,Window,State)
-_CONV_ENUM(Gdk,WindowType)
+_CONV_INCLASS_ENUM(Gdk,Window,Type)
 _CONV_ENUM(Gdk,WindowTypeHint)
 _CONV_ENUM(Gdk,WMDecoration)
 _CONV_ENUM(Gdk,WMFunction)