[gtkmm] Gdk::Window: Change WindowState to Window::State.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Gdk::Window: Change WindowState to Window::State.
- Date: Thu, 27 Apr 2017 15:58:09 +0000 (UTC)
commit ef3477f0042dfd8fc141ea23fcd60924528349e6
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 27 17:33:09 2017 +0200
Gdk::Window: Change WindowState to Window::State.
gdk/src/window.ccg | 2 ++
gdk/src/window.hg | 5 +++--
tools/m4/convert_gdk.m4 | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gdk/src/window.ccg b/gdk/src/window.ccg
index ad6378d..a530260 100644
--- a/gdk/src/window.ccg
+++ b/gdk/src/window.ccg
@@ -23,6 +23,8 @@
#include <gdkmm/drawcontext.h>
#include <gdkmm/drawingcontext.h>
+using State = Gdk::Window::State;
+
namespace Gdk
{
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 80a3cb6..20d0c71 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -34,7 +34,6 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gdk
{
-_WRAP_ENUM(WindowState, GdkWindowState)
_WRAP_ENUM(WindowType, GdkWindowType)
_WRAP_ENUM(WindowHints, GdkWindowHints)
_WRAP_ENUM(WindowTypeHint, GdkWindowTypeHint)
@@ -65,6 +64,8 @@ class Window : public Glib::Object
_IGNORE(gdk_window_destroy, gdk_window_is_destroyed)
public:
+ _WRAP_ENUM(State, GdkWindowState)
+
// _WRAP_CREATE() would not be very useful here.
// The gdk_window_new_*() functions do more than call g_object_new().
// And we can't make one hand-coded constructor for each gdk_window_new_*()
@@ -138,7 +139,7 @@ public:
_WRAP_METHOD(bool is_viewable() const, gdk_window_is_viewable)
_WRAP_METHOD(bool is_input_only() const, gdk_window_is_input_only)
_WRAP_METHOD(bool is_shaped() const, gdk_window_is_shaped)
- _WRAP_METHOD(WindowState get_state() const, gdk_window_get_state)
+ _WRAP_METHOD(State get_state() const, gdk_window_get_state)
_WRAP_METHOD(bool has_native() const, gdk_window_has_native)
_WRAP_METHOD(void set_type_hint(WindowTypeHint hint), gdk_window_set_type_hint)
_WRAP_METHOD(WindowTypeHint get_type_hint(), gdk_window_get_type_hint)
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index e541012..98aa09f 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -64,7 +64,7 @@ _CONV_INCLASS_ENUM(Gdk,Visual,Type)
_CONV_ENUM(Gdk,WindowAttributesType)
_CONV_ENUM(Gdk,WindowEdge)
_CONV_ENUM(Gdk,WindowHints)
-_CONV_ENUM(Gdk,WindowState)
+_CONV_INCLASS_ENUM(Gdk,Window,State)
_CONV_ENUM(Gdk,WindowType)
_CONV_ENUM(Gdk,WindowTypeHint)
_CONV_ENUM(Gdk,WMDecoration)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]