[gtksourceviewmm/gtkmm4] GutterRenderer: Move enums into the class.

[Murray Cumming <murrayc src gnome org>]

commit 9d67231cd234d592271ba85db2688daf19768c8e
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 22:48:07 2017 +0200

    GutterRenderer: Move enums into the class.

 codegen/m4/convert_gtksourceview.m4  |    9 +++++++--
 gtksourceview/src/gutterrenderer.ccg |    3 +++
 gtksourceview/src/gutterrenderer.hg  |   20 ++++++++++----------
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/codegen/m4/convert_gtksourceview.m4 b/codegen/m4/convert_gtksourceview.m4
index 84f2683..e67d33a 100644
--- a/codegen/m4/convert_gtksourceview.m4
+++ b/codegen/m4/convert_gtksourceview.m4
@@ -12,6 +12,11 @@
 ## GTKSOURCE
 #
 
+# _CONV_GSV_INCLASS_ENUM(class_name, enum_name[, C_enum_name])
+# Specify C_enum_name, if it's not the concatenation of Gsv+class_name+enum_name.
+define(`_CONV_GSV_INCLASS_ENUM',`dnl
+_CONV_INCLASS_ENUM(`Gsv',`$1',`$2',`m4_ifelse(`$3',,`GtkSource$1$2',`$3')')
+')dnl
 
 # GtkSourceBuffer -> Gsv::Buffer
 _CONVERSION(`GtkSourceBuffer*',`Glib::RefPtr<Buffer>',`Glib::wrap($3)')
@@ -142,5 +147,5 @@ _CONV_ENUM(GtkSource,DrawSpacesFlags)
 _CONV_ENUM(GtkSource,BackgroundPatternType)
 _CONV_ENUM(GtkSource,CompletionActivation)
 _CONV_ENUM(GtkSource,BracketMatchType)
-_CONV_ENUM(GtkSource,GutterRendererState)
-_CONV_ENUM(GtkSource,GutterRendererAlignmentMode)
+_CONV_GSV_INCLASS_ENUM(GutterRenderer,State)
+_CONV_GSV_INCLASS_ENUM(GutterRenderer,AlignmentMode)
diff --git a/gtksourceview/src/gutterrenderer.ccg b/gtksourceview/src/gutterrenderer.ccg
index d5311c1..ec2bc71 100644
--- a/gtksourceview/src/gutterrenderer.ccg
+++ b/gtksourceview/src/gutterrenderer.ccg
@@ -19,6 +19,9 @@
 
 #include <gtksourceview/gtksource.h>
 
+using State = Gsv::GutterRenderer::State;
+using AlignmentMode = Gsv::GutterRenderer::AlignmentMode;
+
 namespace Gsv
 {
 
diff --git a/gtksourceview/src/gutterrenderer.hg b/gtksourceview/src/gutterrenderer.hg
index c6360fc..4cf2d64 100644
--- a/gtksourceview/src/gutterrenderer.hg
+++ b/gtksourceview/src/gutterrenderer.hg
@@ -30,15 +30,15 @@ _PINCLUDE(gtkmm/private/object_p.h)
 namespace Gsv
 {
 
-_WRAP_ENUM(GutterRendererState, GtkSourceGutterRendererState, s#^SOURCE_##)
-
-_WRAP_ENUM(GutterRendererAlignmentMode, GtkSourceGutterRendererAlignmentMode, s#^SOURCE_##)
-
 // TODO: write docs.
 class GutterRenderer : public Gtk::Object
 {
   _CLASS_GTKOBJECT(GutterRenderer, GtkSourceGutterRenderer, GTK_SOURCE_GUTTER_RENDERER, Gtk::Object, 
GInitiallyUnowned)
 public:
+
+  _WRAP_ENUM(State, GtkSourceGutterRendererState)
+  _WRAP_ENUM(AlignmentMode, GtkSourceGutterRendererAlignmentMode)
+
 #m4 _CONVERSION(`const Cairo::RefPtr<Cairo::Context>&', `cairo_t*', `(($3) ? ($3)->cobj() : 0)')
 #m4 _CONVERSION(`const 
Gtk::TextBuffer::const_iterator&',`GtkTextIter*',const_cast<GtkTextIter*>(($3).gobj()))
   _WRAP_METHOD(void begin(
@@ -54,7 +54,7 @@ public:
                   const Gdk::Rectangle& cell_area,
                   const Gtk::TextBuffer::const_iterator& start,
                   const Gtk::TextBuffer::const_iterator& end,
-                  GutterRendererState), gtk_source_gutter_renderer_draw)
+                  State), gtk_source_gutter_renderer_draw)
 
   _WRAP_METHOD(void end(), gtk_source_gutter_renderer_end)
 
@@ -78,9 +78,9 @@ public:
 
   _WRAP_METHOD(void set_alignment(float xalign, float yalign), gtk_source_gutter_renderer_set_alignment)
 
-  _WRAP_METHOD(GutterRendererAlignmentMode get_alignment_mode() const, 
gtk_source_gutter_renderer_get_alignment_mode)
+  _WRAP_METHOD(AlignmentMode get_alignment_mode() const, gtk_source_gutter_renderer_get_alignment_mode)
 
-  _WRAP_METHOD(void set_alignment_mode(GutterRendererAlignmentMode mode), 
gtk_source_gutter_renderer_set_alignment_mode)
+  _WRAP_METHOD(void set_alignment_mode(AlignmentMode mode), gtk_source_gutter_renderer_set_alignment_mode)
 
   _WRAP_METHOD(Gtk::TextWindowType get_window_type() const, gtk_source_gutter_renderer_get_window_type)
 
@@ -109,7 +109,7 @@ public:
   _WRAP_PROPERTY("xalign", float)
   _WRAP_PROPERTY("yalign", float)
   _WRAP_PROPERTY("view", Gtk::TextView*)
-  _WRAP_PROPERTY("alignment-mode", GutterRendererAlignmentMode)
+  _WRAP_PROPERTY("alignment-mode", AlignmentMode)
   _WRAP_PROPERTY("window-type", Gtk::TextWindowType)
   _WRAP_PROPERTY("size", int)
   _WRAP_PROPERTY("background-rgba", Gdk::RGBA)
@@ -135,7 +135,7 @@ public:
 
   _WRAP_SIGNAL(void query_data(const Gtk::TextBuffer::iterator& start,
                                const Gtk::TextBuffer::iterator& end,
-                               GutterRendererState state), "query-data")
+                               State state), "query-data")
 
   _WRAP_SIGNAL(bool query_activatable(const Gtk::TextBuffer::iterator& iter,
                                       const Gdk::Rectangle& area,
@@ -158,7 +158,7 @@ protected:
                         const Gdk::Rectangle& cell_area,
                         const Gtk::TextBuffer::const_iterator& start,
                         const Gtk::TextBuffer::const_iterator& end,
-                        GutterRendererState), draw)
+                        State), draw)
 
   _WRAP_VFUNC(void end(), end)