[gtkmm] TreeModel: Change TreeModelFlags to TreeModel::Flags.

[Murray Cumming <murrayc src gnome org>]

commit a2b4310c572a2342e4d3860a35055b69b2f6386d
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 20:43:55 2017 +0200

    TreeModel: Change TreeModelFlags to TreeModel::Flags.

 gtk/src/treemodel.ccg   |    2 ++
 gtk/src/treemodel.hg    |    7 ++++---
 tools/m4/convert_gtk.m4 |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gtk/src/treemodel.ccg b/gtk/src/treemodel.ccg
index 599a8a9..0882773 100644
--- a/gtk/src/treemodel.ccg
+++ b/gtk/src/treemodel.ccg
@@ -22,6 +22,8 @@
 #include <gtkmm/treepath.h>
 #include <gtk/gtk.h>
 
+using Flags = Gtk::TreeModel::Flags;
+
 namespace
 {
 
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index 06af610..929bebf 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -35,7 +35,6 @@ class TreePath;
 class TreeRowReference;
 
 _CC_INCLUDE(gtk/gtk.h)
-_WRAP_ENUM(TreeModelFlags, GtkTreeModelFlags)
 
 //TODO: Remove any mention of null arguments from the method documentation, by adding overrides in 
gtk_docs_override.xml.
 /** This class defines a generic tree interface for use by the Gtk::TreeView widget.
@@ -109,6 +108,8 @@ public:
   //These are part of GtkTreeModelFilter or GtkTreeModelSort, not GtkTreeModel:
   _IGNORE(gtk_tree_model_filter_new, gtk_tree_model_sort_new_with_model)
 
+  _WRAP_ENUM(Flags, GtkTreeModelFlags)
+
   /** Returns a valid iterator pointing to @a path.
    *
    * @param path The @link Gtk::TreePath Gtk::TreeModel::Path@endlink.
@@ -187,7 +188,7 @@ public:
    */
   void foreach(const SlotForeachPathAndIter& slot);
 
-  _WRAP_METHOD(TreeModelFlags get_flags() const, gtk_tree_model_get_flags)
+  _WRAP_METHOD(Flags get_flags() const, gtk_tree_model_get_flags)
   _WRAP_METHOD(int get_n_columns() const, gtk_tree_model_get_n_columns)
   _WRAP_METHOD(GType get_column_type(int index) const, gtk_tree_model_get_column_type)
   //TODO: A C++-type version of get_column_type()?
@@ -234,7 +235,7 @@ public:
   _WRAP_SIGNAL(void rows_reordered(const TreeModel::Path& path, const TreeModel::iterator& iter, int* 
new_order), "rows_reordered")
 
 protected:
-  _WRAP_VFUNC(TreeModelFlags get_flags() const, get_flags)
+  _WRAP_VFUNC(Flags get_flags() const, get_flags)
   _WRAP_VFUNC(int get_n_columns() const, get_n_columns)
   _WRAP_VFUNC(GType get_column_type(int index) const, get_column_type)
 
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index d24ed6f..c7a0973 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -119,7 +119,7 @@ _CONV_ENUM(Gtk,TextWindowType)
 _CONV_ENUM(Gtk,ToolbarChildType)
 _CONV_ENUM(Gtk,ToolbarStyle)
 _CONV_ENUM(Gtk,ToolPaletteDragTargets)
-_CONV_ENUM(Gtk,TreeModelFlags)
+_CONV_INCLASS_ENUM(Gtk,TreeModel,Flags)
 _CONV_ENUM(Gtk,TreeViewColumnSizing)
 _CONV_ENUM(Gtk,TreeViewDropPosition)
 _CONV_ENUM(Gtk,TreeViewGridLines)