[gtkmm] Scrollable: Change ScrollablePolicy to Scrollable::Policy.



commit 1c51710c0d65dfd73fa083caa73bbf668864857a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 21:13:09 2017 +0200

    Scrollable: Change ScrollablePolicy to Scrollable::Policy.

 gtk/src/scrollable.ccg  |    2 ++
 gtk/src/scrollable.hg   |   16 ++++++++--------
 tools/m4/convert_gtk.m4 |    2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/gtk/src/scrollable.ccg b/gtk/src/scrollable.ccg
index 0486421..26267fe 100644
--- a/gtk/src/scrollable.ccg
+++ b/gtk/src/scrollable.ccg
@@ -17,6 +17,8 @@
 
 #include <gtk/gtk.h>
 
+using Policy = Gtk::Scrollable::Policy;
+
 namespace Gtk
 {
 
diff --git a/gtk/src/scrollable.hg b/gtk/src/scrollable.hg
index 45c164b..916e1ef 100644
--- a/gtk/src/scrollable.hg
+++ b/gtk/src/scrollable.hg
@@ -32,8 +32,6 @@ typedef struct _GtkScrollableInterface GtkScrollableInterface;
 namespace Gtk
 {
 
-_WRAP_ENUM(ScrollablePolicy, GtkScrollablePolicy)
-
 /** This interface is implemented by widgets with native
  * scrolling ability.
  *
@@ -44,6 +42,8 @@ class Scrollable : public Glib::Interface
   _CLASS_INTERFACE(Scrollable, GtkScrollable, GTK_SCROLLABLE, GtkScrollableInterface)
 
 public:
+  _WRAP_ENUM(Policy, GtkScrollablePolicy)
+
   _WRAP_METHOD(Glib::RefPtr<Adjustment> get_hadjustment(), gtk_scrollable_get_hadjustment, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_hadjustment() const, gtk_scrollable_get_hadjustment, 
refreturn, constversion)
 
@@ -64,16 +64,16 @@ public:
    */
   void unset_vadjustment();
 
-  _WRAP_METHOD(ScrollablePolicy get_hscroll_policy() const, gtk_scrollable_get_hscroll_policy)
-  _WRAP_METHOD(void set_hscroll_policy(ScrollablePolicy policy), gtk_scrollable_set_hscroll_policy)
-  _WRAP_METHOD(ScrollablePolicy get_vscroll_policy() const, gtk_scrollable_get_vscroll_policy)
-  _WRAP_METHOD(void set_vscroll_policy(ScrollablePolicy policy), gtk_scrollable_set_vscroll_policy)
+  _WRAP_METHOD(Policy get_hscroll_policy() const, gtk_scrollable_get_hscroll_policy)
+  _WRAP_METHOD(void set_hscroll_policy(Policy policy), gtk_scrollable_set_hscroll_policy)
+  _WRAP_METHOD(Policy get_vscroll_policy() const, gtk_scrollable_get_vscroll_policy)
+  _WRAP_METHOD(void set_vscroll_policy(Policy policy), gtk_scrollable_set_vscroll_policy)
   _WRAP_METHOD(bool get_border(Border& border) const, gtk_scrollable_get_border)
 
   _WRAP_PROPERTY("hadjustment", Glib::RefPtr<Adjustment>)
   _WRAP_PROPERTY("vadjustment", Glib::RefPtr<Adjustment>)
-  _WRAP_PROPERTY("hscroll-policy", ScrollablePolicy)
-  _WRAP_PROPERTY("vscroll-policy", ScrollablePolicy)
+  _WRAP_PROPERTY("hscroll-policy", Policy)
+  _WRAP_PROPERTY("vscroll-policy", Policy)
 
   _WRAP_VFUNC(bool get_border(Border& border) const, get_border, custom_vfunc_callback)
 };
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index b0e822f..75a12da 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -157,7 +157,7 @@ _CONV_ENUM(Gtk,WrapAllocationMode)
 _CONV_ENUM(Gtk,WrapBoxPacking)
 _CONV_ENUM(Gtk,WrapBoxSpreading)
 _CONV_ENUM(Gtk,SizeRequestMode)
-_CONV_ENUM(Gtk,ScrollablePolicy)
+_CONV_INCLASS_ENUM(Gtk,Scrollable,Policy)
 _CONV_ENUM(Gtk,StateFlags)
 _CONV_INCLASS_ENUM(Gtk,Application,InhibitFlags)
 _CONV_ENUM(Gtk,InputPurpose)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]