[gtkmm] Popover: Change PopoverConstraint to Popover::Constraint.

[Murray Cumming <murrayc src gnome org>]

commit 2d1d0f1c1a6b2ffe430527254df057bdff3c9e0a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 20:55:39 2017 +0200

    Popover: Change PopoverConstraint to Popover::Constraint.

 gtk/src/popover.ccg     |    1 +
 gtk/src/popover.hg      |    8 ++++----
 tools/m4/convert_gtk.m4 |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gtk/src/popover.ccg b/gtk/src/popover.ccg
index 0f2cacd..e169fb4 100644
--- a/gtk/src/popover.ccg
+++ b/gtk/src/popover.ccg
@@ -18,6 +18,7 @@
 
 #include <gtk/gtk.h>
 
+using Constraint = Gtk::Popover::Constraint;
 
 namespace Gtk
 {
diff --git a/gtk/src/popover.hg b/gtk/src/popover.hg
index 03857eb..9b88938 100644
--- a/gtk/src/popover.hg
+++ b/gtk/src/popover.hg
@@ -24,7 +24,6 @@ _PINCLUDE(gtkmm/private/bin_p.h)
 
 namespace Gtk
 {
-_WRAP_ENUM(PopoverConstraint, GtkPopoverConstraint)
 
 /** Context dependent bubbles.
  *
@@ -53,6 +52,7 @@ class Popover
 {
   _CLASS_GTKOBJECT(Popover, GtkPopover, GTK_POPOVER, Gtk::Bin, GtkBin)
 public:
+  _WRAP_ENUM(Constraint, GtkPopoverConstraint)
 
   /** Creates a new popover to point to @a relative_to
    *
@@ -125,8 +125,8 @@ public:
   _WRAP_METHOD(Widget* get_default_widget(), gtk_popover_get_default_widget)
   _WRAP_METHOD(const Widget* get_default_widget() const, gtk_popover_get_default_widget, constversion)
 
-  _WRAP_METHOD(void set_constrain_to(PopoverConstraint constraint), gtk_popover_set_constrain_to)
-  _WRAP_METHOD(PopoverConstraint get_constrain_to() const, gtk_popover_get_constrain_to)
+  _WRAP_METHOD(void set_constrain_to(Constraint constraint), gtk_popover_set_constrain_to)
+  _WRAP_METHOD(Constraint get_constrain_to() const, gtk_popover_get_constrain_to)
 
   _WRAP_METHOD(void popup(), gtk_popover_popup)
   _WRAP_METHOD(void popdown(), gtk_popover_popdown)
@@ -135,7 +135,7 @@ public:
   _WRAP_PROPERTY("pointing-to", Gdk::Rectangle)
   _WRAP_PROPERTY("position", PositionType)
   _WRAP_PROPERTY("modal", bool)
-  _WRAP_PROPERTY("constrain-to", PopoverConstraint)
+  _WRAP_PROPERTY("constrain-to", Constraint)
 
   _WRAP_SIGNAL(void closed(), "closed")
 };
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index c7a0973..74171f9 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -95,7 +95,7 @@ _CONV_ENUM(Gtk,PackDirection)
 _CONV_ENUM(Gtk,PanDirection)
 _CONV_ENUM(Gtk,PlacesOpenFlags)
 _CONV_ENUM(Gtk,PolicyType)
-_CONV_ENUM(Gtk,PopoverConstraint)
+_CONV_INCLASS_ENUM(Gtk,Popover,Constraint)
 _CONV_ENUM(Gtk,PositionType)
 _CONV_ENUM(Gtk,PreviewType)
 _CONV_ENUM(Gtk,ProgressBarOrientation)