[gtkmm] Calendar: Change CalendarDisplayOptions to Calendar::Display::Options.

[Murray Cumming <murrayc src gnome org>]

commit 0efbaf33e48160b8ea20fd493e3eff6ba90e18c1
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 14:28:58 2017 +0200

    Calendar: Change CalendarDisplayOptions to Calendar::Display::Options.

 gtk/src/calendar.ccg    |    2 ++
 gtk/src/calendar.hg     |    7 ++++---
 tools/m4/convert_gtk.m4 |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gtk/src/calendar.ccg b/gtk/src/calendar.ccg
index f3773b4..6ee0a23 100644
--- a/gtk/src/calendar.ccg
+++ b/gtk/src/calendar.ccg
@@ -18,6 +18,8 @@
 
 #include <gtk/gtk.h>
 
+using DisplayOptions = Gtk::Calendar::DisplayOptions;
+
 namespace
 {
 extern "C"
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index c66e674..76774bc 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -27,7 +27,6 @@ namespace Gtk
 {
 
 _CC_INCLUDE(gtk/gtk.h)
-_WRAP_ENUM(CalendarDisplayOptions, GtkCalendarDisplayOptions)
 
 /** Display a calendar and/or allow the user to select a date.
  *
@@ -54,6 +53,8 @@ class Calendar : public Widget
 {
   _CLASS_GTKOBJECT(Calendar,GtkCalendar,GTK_CALENDAR,Gtk::Widget,GtkWidget)
 public:
+  _WRAP_ENUM(DisplayOptions, GtkCalendarDisplayOptions)
+
   _CTOR_DEFAULT
 
   _WRAP_METHOD(void select_month(guint month, guint year), gtk_calendar_select_month)
@@ -62,8 +63,8 @@ public:
   _WRAP_METHOD(void unmark_day(guint day), gtk_calendar_unmark_day)
   _WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
 
-  _WRAP_METHOD(void set_display_options(CalendarDisplayOptions flags), gtk_calendar_set_display_options)
-  _WRAP_METHOD(CalendarDisplayOptions get_display_options() const, gtk_calendar_get_display_options)
+  _WRAP_METHOD(void set_display_options(DisplayOptions flags), gtk_calendar_set_display_options)
+  _WRAP_METHOD(DisplayOptions get_display_options() const, gtk_calendar_get_display_options)
 
   _WRAP_METHOD(void get_date(guint& year, guint& month, guint& day) const, gtk_calendar_get_date)
   // Additional method not in GTK (#350584)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 1b3c790..d24ed6f 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -71,7 +71,7 @@ _CONV_ENUM(Gtk,ArrowType)
 _CONV_ENUM(Gtk,ButtonBoxStyle)
 _CONV_ENUM(Gtk,ButtonRole)
 _CONV_ENUM(Gtk,ButtonsType)
-_CONV_ENUM(Gtk,CalendarDisplayOptions)
+_CONV_INCLASS_ENUM(Gtk,Calendar,DisplayOptions)
 _CONV_ENUM(Gtk,CellRendererMode)
 _CONV_ENUM(Gtk,CellRendererState)
 _CONV_ENUM(Gtk,CornerType)