[gtkmm] Gdk::Seat: Change SeatCapabilities to Seat::Capabilities.



commit f1fbdfd34fee51b56cf3b85ae7cc3e95d6221b89
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 14:17:59 2017 +0200

    Gdk::Seat: Change SeatCapabilities to Seat::Capabilities.

 gdk/src/seat.ccg        |    2 ++
 gdk/src/seat.hg         |   11 ++++++-----
 tools/m4/convert_gdk.m4 |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gdk/src/seat.ccg b/gdk/src/seat.ccg
index 7bea554..ff5107f 100644
--- a/gdk/src/seat.ccg
+++ b/gdk/src/seat.ccg
@@ -17,6 +17,8 @@
 #include <gdkmm/display.h>
 #include <gdkmm/window.h>
 
+using Capabilities = Gdk::Seat::Capabilities;
+
 namespace
 {
 
diff --git a/gdk/src/seat.hg b/gdk/src/seat.hg
index e623f13..db9185f 100644
--- a/gdk/src/seat.hg
+++ b/gdk/src/seat.hg
@@ -24,7 +24,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Gdk
 {
-_WRAP_ENUM(SeatCapabilities, GdkSeatCapabilities)
 
 class Display;
 class Window;
@@ -41,6 +40,8 @@ protected:
   _CTOR_DEFAULT()
 
 public:
+  _WRAP_ENUM(Capabilities, GdkSeatCapabilities)
+
   /** For instance,<br>
    *   void on_grab_prepare(const Glib::RefPtr<Gdk::Window>& window);
    *
@@ -55,7 +56,7 @@ public:
   typedef sigc::slot<void(const Glib::RefPtr<Window>&)> SlotGrabPrepare;
 
   _WRAP_METHOD(GrabStatus grab(const Glib::RefPtr<Window>& window,
-               SeatCapabilities capabilities,
+               Capabilities capabilities,
                bool owner_events,
                const Glib::RefPtr<Cursor>& cursor = Glib::RefPtr<Cursor>(),
                const GdkEvent* event = nullptr,
@@ -65,12 +66,12 @@ public:
   _WRAP_METHOD(void ungrab(), gdk_seat_ungrab)
   _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_seat_get_display, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_seat_get_display, refreturn, 
constversion)
-  _WRAP_METHOD(SeatCapabilities get_capabilities() const, gdk_seat_get_capabilities)
+  _WRAP_METHOD(Capabilities get_capabilities() const, gdk_seat_get_capabilities)
 
 #m4 
_CONVERSION(`GList*',`std::vector<Glib::RefPtr<Device>>',`Glib::ListHandler<Glib::RefPtr<Device>>::list_to_vector($3,
 Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<Device>> get_slaves(SeatCapabilities capabilities), 
gdk_seat_get_slaves)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<Device>> get_slaves(Capabilities capabilities), gdk_seat_get_slaves)
 #m4 _CONVERSION(`GList*',`std::vector<Glib::RefPtr<const Device>>',`Glib::ListHandler<Glib::RefPtr<const 
Device>>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector<Glib::RefPtr<const Device>> get_slaves(SeatCapabilities capabilities) const, 
gdk_seat_get_slaves)
+  _WRAP_METHOD(std::vector<Glib::RefPtr<const Device>> get_slaves(Capabilities capabilities) const, 
gdk_seat_get_slaves)
 
   _WRAP_METHOD(Glib::RefPtr<Device> get_pointer(), gdk_seat_get_pointer, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Device> get_pointer() const, gdk_seat_get_pointer, refreturn, constversion)
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 752c57e..e541012 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -56,7 +56,7 @@ _CONV_ENUM(Gdk,ModifierType)
 _CONV_ENUM(Gdk,ModifierIntent)
 _CONV_ENUM(Gdk,OverlapType)
 _CONV_ENUM(Gdk,RgbDither)
-_CONV_ENUM(Gdk,SeatCapabilities)
+_CONV_INCLASS_ENUM(Gdk,Seat,Capabilities)
 _CONV_ENUM(Gdk,Status)
 _CONV_ENUM(Gdk,SubpixelLayout)
 _CONV_ENUM(Gdk,SubwindowMode)


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