[gtkmm] Image: Change ImageType to Image::Type.

[Murray Cumming <murrayc src gnome org>]

commit 635042fc978d52d79516c2d27146baff6dbe238c
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 21:14:47 2017 +0200

    Image: Change ImageType to Image::Type.

 gtk/src/entry.hg        |    8 ++++----
 gtk/src/image.ccg       |    2 ++
 gtk/src/image.hg        |    7 +++----
 tools/m4/convert_gtk.m4 |    2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index af7e4ec..2d47b1b 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -22,7 +22,7 @@
 #include <gtkmm/celleditable.h>
 #include <gtkmm/entrycompletion.h>
 #include <gtkmm/adjustment.h>
-#include <gtkmm/image.h> //For ImageType.
+#include <gtkmm/image.h> //For Image::Type.
 #include <gtkmm/border.h>
 #include <gtkmm/entrybuffer.h>
 #include <pangomm/attrlist.h>
@@ -136,7 +136,7 @@ public:
    */
   void unset_icon(EntryIconPosition icon_pos = EntryIconPosition::PRIMARY);
 
-  _WRAP_METHOD(ImageType get_icon_storage_type(EntryIconPosition icon_pos = EntryIconPosition::PRIMARY) 
const, gtk_entry_get_icon_storage_type)
+  _WRAP_METHOD(Image::Type get_icon_storage_type(EntryIconPosition icon_pos = EntryIconPosition::PRIMARY) 
const, gtk_entry_get_icon_storage_type)
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = 
EntryIconPosition::PRIMARY), gtk_entry_get_icon_pixbuf, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = 
EntryIconPosition::PRIMARY) const, gtk_entry_get_icon_pixbuf, refreturn, constversion)
   _WRAP_METHOD(Glib::ustring get_icon_name(EntryIconPosition icon_pos = EntryIconPosition::PRIMARY) const, 
gtk_entry_get_icon_name)
@@ -247,8 +247,8 @@ public:
   _WRAP_PROPERTY("secondary-icon-name", Glib::ustring)
   _WRAP_PROPERTY("primary-icon-gicon", Glib::RefPtr<Gio::Icon>)
   _WRAP_PROPERTY("secondary-icon-gicon", Glib::RefPtr<Gio::Icon>)
-  _WRAP_PROPERTY("primary-icon-storage-type", ImageType)
-  _WRAP_PROPERTY("secondary-icon-storage-type", ImageType)
+  _WRAP_PROPERTY("primary-icon-storage-type", Image::Type)
+  _WRAP_PROPERTY("secondary-icon-storage-type", Image::Type)
   _WRAP_PROPERTY("primary-icon-activatable", bool)
   _WRAP_PROPERTY("secondary-icon-activatable", bool)
   _WRAP_PROPERTY("primary-icon-sensitive", bool)
diff --git a/gtk/src/image.ccg b/gtk/src/image.ccg
index 4a094d6..9e177ae 100644
--- a/gtk/src/image.ccg
+++ b/gtk/src/image.ccg
@@ -18,6 +18,8 @@
 
 #include <gtk/gtk.h>
 
+using Type = Gtk::Image::Type;
+
 namespace Gtk
 {
 
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index fd9539c..9b2beb1 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -27,8 +27,6 @@ namespace Gtk
 {
 
 _CC_INCLUDE(gtk/gtk.h)
-_WRAP_ENUM(ImageType, GtkImageType)
-
 
 /** A widget displaying an image.
  *
@@ -50,6 +48,7 @@ class Image : public Widget
 {
   _CLASS_GTKOBJECT(Image,GtkImage,GTK_IMAGE,Gtk::Widget,GtkWidget)
 public:
+  _WRAP_ENUM(Type, GtkImageType)
 
   _CTOR_DEFAULT
 
@@ -91,7 +90,7 @@ public:
 
   _WRAP_METHOD(void clear(), gtk_image_clear)
 
-  _WRAP_METHOD(ImageType get_storage_type() const, gtk_image_get_storage_type)
+  _WRAP_METHOD(Type get_storage_type() const, gtk_image_get_storage_type)
 
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(), gtk_image_get_pixbuf, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf() const, gtk_image_get_pixbuf, refreturn, 
constversion)
@@ -133,7 +132,7 @@ public:
   _WRAP_PROPERTY("pixel-size", int)
   _WRAP_PROPERTY("pixbuf-animation", Glib::RefPtr<Gdk::PixbufAnimation>)
   _WRAP_PROPERTY("icon-name", Glib::ustring)
-  _WRAP_PROPERTY("storage-type", ImageType)
+  _WRAP_PROPERTY("storage-type", Type)
   _WRAP_PROPERTY("gicon", Glib::RefPtr<Gio::Icon>)
   _WRAP_PROPERTY("use-fallback", bool)
   _WRAP_PROPERTY("resource", std::string)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 75a12da..0b6d6c3 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -82,7 +82,7 @@ _CONV_ENUM(Gtk,DeleteType)
 _CONV_ENUM(Gtk,DestDefaults)
 _CONV_ENUM(Gtk,DirectionType)
 _CONV_ENUM(Gtk,EventSequenceState)
-_CONV_ENUM(Gtk,ImageType)
+_CONV_INCLASS_ENUM(Gtk,Image,Type)
 _CONV_ENUM(Gtk,Justification)
 _CONV_ENUM(Gtk,License)
 _CONV_ENUM(Gtk,MenuDirectionType)