[gtkmm] SizeGroup: Rename SizeGroupMode enum to SizeGroup::Mode.

[Murray Cumming <murrayc src gnome org>]

commit 5bac5f812a426a526dc858202685492006360560
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Apr 17 08:50:39 2017 +0200

    SizeGroup: Rename SizeGroupMode enum to SizeGroup::Mode.
    
    Putting the num inside the class.
    
    Bug #86864

 demos/gtk-demo/example_change_display.cc |    2 +-
 demos/gtk-demo/example_iconbrowser.cc    |    2 +-
 demos/gtk-demo/example_sizegroup.cc      |    8 ++++----
 gtk/src/sizegroup.ccg                    |    4 +++-
 gtk/src/sizegroup.hg                     |   15 +++++++++------
 tools/m4/convert_gtk.m4                  |    2 +-
 6 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index adc5fd5..484ff93 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -135,7 +135,7 @@ Example_ChangeDisplay::Example_ChangeDisplay()
 
     m_VBox.pack_start(m_Frame_Display);
 
-    m_refSizeGroup_Display = Gtk::SizeGroup::create(Gtk::SizeGroupMode::HORIZONTAL);
+    m_refSizeGroup_Display = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::HORIZONTAL);
     m_refSizeGroup_Display->add_widget(m_ButtonBox_Display);
   }
 
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index 53524c0..9b507d9 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -204,7 +204,7 @@ Example_IconBrowser::Example_IconBrowser()
   m_symbolic_radio.set_draw_indicator(false);
   m_symbolic_radio.join_group(m_normal_radio);
 
-  m_button_size_group = Gtk::SizeGroup::create(Gtk::SizeGroupMode::VERTICAL);
+  m_button_size_group = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::VERTICAL);
   m_button_size_group->add_widget(m_normal_radio);
   m_button_size_group->add_widget(m_symbolic_radio);
   m_button_size_group->add_widget(m_search_button);
diff --git a/demos/gtk-demo/example_sizegroup.cc b/demos/gtk-demo/example_sizegroup.cc
index 21af886..c1ef187 100644
--- a/demos/gtk-demo/example_sizegroup.cc
+++ b/demos/gtk-demo/example_sizegroup.cc
@@ -61,7 +61,7 @@ Example_SizeGroup::Example_SizeGroup()
   get_content_area()->pack_start(m_VBox);
   m_VBox.property_margin() = 5;
 
-  m_refSizeGroup = Gtk::SizeGroup::create(Gtk::SizeGroupMode::HORIZONTAL),
+  m_refSizeGroup = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::HORIZONTAL),
 
   /* Create one frame holding color options
    */
@@ -116,12 +116,12 @@ Example_SizeGroup::~Example_SizeGroup()
 
 void Example_SizeGroup::on_checkbutton_toggled()
 {
-  auto new_mode = Gtk::SizeGroupMode::HORIZONTAL;
+  auto new_mode = Gtk::SizeGroup::Mode::HORIZONTAL;
 
   if(m_CheckButton.get_active())
-    new_mode = Gtk::SizeGroupMode::HORIZONTAL;
+    new_mode = Gtk::SizeGroup::Mode::HORIZONTAL;
   else
-    new_mode = Gtk::SizeGroupMode::NONE;
+    new_mode = Gtk::SizeGroup::Mode::NONE;
 
   m_refSizeGroup->set_mode(new_mode);
 }
diff --git a/gtk/src/sizegroup.ccg b/gtk/src/sizegroup.ccg
index dc2ab38..62ac98a 100644
--- a/gtk/src/sizegroup.ccg
+++ b/gtk/src/sizegroup.ccg
@@ -20,10 +20,12 @@
 
 #include <gtk/gtk.h>
 
+using Mode = Gtk::SizeGroup::Mode;
+
 namespace Gtk
 {
 
-SizeGroup::SizeGroup(SizeGroupMode mode)
+SizeGroup::SizeGroup(Mode mode)
 :
   _CONSTRUCT("mode", (GtkSizeGroupMode) mode)
 {}
diff --git a/gtk/src/sizegroup.hg b/gtk/src/sizegroup.hg
index 97919de..6340159 100644
--- a/gtk/src/sizegroup.hg
+++ b/gtk/src/sizegroup.hg
@@ -28,7 +28,6 @@ namespace Gtk
 {
 
 _CC_INCLUDE(gtk/gtk.h)
-_WRAP_ENUM(SizeGroupMode, GtkSizeGroupMode)
 
 /** Gtk::SizeGroup provides a mechanism for grouping a number of widgets together so they all request the 
same amount of space.
  * This is typically useful when you want a column of widgets to have the same size, but you can't use a 
Gtk::Grid widget.
@@ -53,15 +52,19 @@ class SizeGroup
 {
   _CLASS_GOBJECT(SizeGroup,GtkSizeGroup,GTK_SIZE_GROUP,Glib::Object,GObject)
   _IMPLEMENTS_INTERFACE(Buildable)
+public:
+  _WRAP_ENUM(Mode, GtkSizeGroupMode)
+
 protected:
-  explicit SizeGroup(SizeGroupMode mode);
+  explicit SizeGroup(Mode mode);
 
 public:
 
-  _WRAP_CREATE(SizeGroupMode mode)
 
-  _WRAP_METHOD(void set_mode(SizeGroupMode mode), gtk_size_group_set_mode)
-  _WRAP_METHOD(SizeGroupMode get_mode() const, gtk_size_group_get_mode)
+  _WRAP_CREATE(Mode mode)
+
+  _WRAP_METHOD(void set_mode(Mode mode), gtk_size_group_set_mode)
+  _WRAP_METHOD(Mode get_mode() const, gtk_size_group_get_mode)
 
   _WRAP_METHOD(void add_widget(Widget& widget), gtk_size_group_add_widget)
   _WRAP_METHOD(void remove_widget(Widget& widget), gtk_size_group_remove_widget)
@@ -71,7 +74,7 @@ public:
 #m4 _CONVERSION(`GSList*',`std::vector<const Widget*>',`Glib::SListHandler<const 
Widget*>::slist_to_vector($3, Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(std::vector<const Widget*> get_widgets() const, gtk_size_group_get_widgets)
 
-  _WRAP_PROPERTY("mode", SizeGroupMode)
+  _WRAP_PROPERTY("mode", Mode)
 };
 
 } //namespace Gtk
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index b58258b..d6643cc 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -107,7 +107,7 @@ _CONV_ENUM(Gtk,ScrollType)
 _CONV_ENUM(Gtk,SelectionMode)
 _CONV_ENUM(Gtk,ShadowType)
 _CONV_ENUM(Gtk,ShortcutType)
-_CONV_ENUM(Gtk,SizeGroupMode)
+_CONV_INCLASS_ENUM(Gtk,SizeGroup,Mode)
 _CONV_ENUM(Gtk,SortType)
 _CONV_ENUM(Gtk,SpinButtonUpdatePolicy)
 _CONV_ENUM(Gtk,SpinType)