[gtkmm] Gdk::Window: Change WindowTypeHint to Window::TypeHint.

[Murray Cumming <murrayc src gnome org>]

commit 4d9f5cb1ab5b8430dfc89f6d23df1e96ec033bb7
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 17:48:33 2017 +0200

    Gdk::Window: Change WindowTypeHint to Window::TypeHint.

 gdk/src/window.ccg      |    1 +
 gdk/src/window.hg       |    6 +++---
 gtk/src/menu.hg         |    2 +-
 gtk/src/window.hg       |    6 +++---
 tools/m4/convert_gdk.m4 |    2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/gdk/src/window.ccg b/gdk/src/window.ccg
index 77fd71b..f88e6c9 100644
--- a/gdk/src/window.ccg
+++ b/gdk/src/window.ccg
@@ -25,6 +25,7 @@
 
 using Type = Gdk::Window::Type;
 using State = Gdk::Window::State;
+using TypeHint = Gdk::Window::TypeHint;
 
 namespace Gdk
 {
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 27e3231..726e8e2 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(WindowTypeHint, GdkWindowTypeHint)
 _WRAP_ENUM(WMDecoration, GdkWMDecoration)
 _WRAP_ENUM(WMFunction, GdkWMFunction)
 _WRAP_ENUM(WindowEdge, GdkWindowEdge)
@@ -65,6 +64,7 @@ public:
   _WRAP_ENUM(Type, GdkWindowType)
   _WRAP_ENUM(State, GdkWindowState)
   _WRAP_ENUM(Hints, GdkWindowHints)
+  _WRAP_ENUM(TypeHint, GdkWindowTypeHint)
 
   // _WRAP_CREATE() would not be very useful here.
   // The gdk_window_new_*() functions do more than call g_object_new().
@@ -141,8 +141,8 @@ public:
   _WRAP_METHOD(bool is_shaped() const, gdk_window_is_shaped)
   _WRAP_METHOD(State get_state() const, gdk_window_get_state)
   _WRAP_METHOD(bool has_native() const, gdk_window_has_native)
-  _WRAP_METHOD(void set_type_hint(WindowTypeHint hint), gdk_window_set_type_hint)
-  _WRAP_METHOD(WindowTypeHint get_type_hint(), gdk_window_get_type_hint)
+  _WRAP_METHOD(void set_type_hint(TypeHint hint), gdk_window_set_type_hint)
+  _WRAP_METHOD(TypeHint get_type_hint(), gdk_window_get_type_hint)
   _WRAP_METHOD(bool get_modal_hint() const, gdk_window_get_modal_hint)
   _WRAP_METHOD(void set_modal_hint(bool modal = true), gdk_window_set_modal_hint)
   _WRAP_METHOD(void set_geometry_hints(const Geometry& geometry, Hints geom_mask), 
gdk_window_set_geometry_hints)
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index 8cebd5d..2574545 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -159,7 +159,7 @@ public:
   _WRAP_PROPERTY("anchor-hints", Gdk::AnchorHints)
   _WRAP_PROPERTY("rect-anchor-dx", int)
   _WRAP_PROPERTY("rect-anchor-dy", int)
-  _WRAP_PROPERTY("menu-type-hint", Gdk::WindowTypeHint)
+  _WRAP_PROPERTY("menu-type-hint", Gdk::Window::TypeHint)
 
 protected:
 
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 206bc4a..6716a39 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -67,7 +67,7 @@ public:
   _WRAP_PROPERTY("icon-name", Glib::ustring)
   _WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
   _WRAP_PROPERTY("is_active", bool)
-  _WRAP_PROPERTY("type_hint", GdkWindowTypeHint)
+  _WRAP_PROPERTY("type_hint", Gdk::Window::TypeHint)
   _WRAP_PROPERTY("skip_taskbar_hint", bool)
   _WRAP_PROPERTY("skip_pager_hint", bool)
   _WRAP_PROPERTY("role", Glib::ustring)
@@ -164,8 +164,8 @@ dnl
   _WRAP_METHOD(Widget* get_attached_to(), gtk_window_get_attached_to)
   _WRAP_METHOD(const Widget* get_attached_to() const, gtk_window_get_attached_to, constversion)
 
-  _WRAP_METHOD(void set_type_hint(Gdk::WindowTypeHint hint), gtk_window_set_type_hint)
-  _WRAP_METHOD(Gdk::WindowTypeHint get_type_hint() const, gtk_window_get_type_hint)
+  _WRAP_METHOD(void set_type_hint(Gdk::Window::TypeHint hint), gtk_window_set_type_hint)
+  _WRAP_METHOD(Gdk::Window::TypeHint get_type_hint() const, gtk_window_get_type_hint)
 
   _WRAP_METHOD(void set_skip_taskbar_hint(bool setting = true), gtk_window_set_skip_taskbar_hint)
   _WRAP_METHOD(bool get_skip_taskbar_hint() const, gtk_window_get_skip_taskbar_hint)
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index c820b66..4ce5c39 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -66,7 +66,7 @@ _CONV_ENUM(Gdk,WindowEdge)
 _CONV_INCLASS_ENUM(Gdk,Window,Hints)
 _CONV_INCLASS_ENUM(Gdk,Window,State)
 _CONV_INCLASS_ENUM(Gdk,Window,Type)
-_CONV_ENUM(Gdk,WindowTypeHint)
+_CONV_INCLASS_ENUM(Gdk,Window,TypeHint)
 _CONV_ENUM(Gdk,WMDecoration)
 _CONV_ENUM(Gdk,WMFunction)
 _CONV_ENUM(Gdk,GrabStatus)