[gtkmm] Application: Change ApplicationInhibitFlags to Application::InhibitFlags.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Application: Change ApplicationInhibitFlags to Application::InhibitFlags.
- Date: Thu, 27 Apr 2017 15:27:29 +0000 (UTC)
commit 021b48bd116dd6d00dba3be22d6fc50c60b017bf
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 27 14:48:58 2017 +0200
Application: Change ApplicationInhibitFlags to Application::InhibitFlags.
gtk/src/application.hg | 8 +++-----
tools/m4/convert_gtk.m4 | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gtk/src/application.hg b/gtk/src/application.hg
index 739477a..8d2d8c2 100644
--- a/gtk/src/application.hg
+++ b/gtk/src/application.hg
@@ -35,8 +35,6 @@ typedef struct _GtkWindow GtkWindow;
namespace Gtk
{
-_WRAP_ENUM(ApplicationInhibitFlags, GtkApplicationInhibitFlags)
-
class Window;
//TODO: Add overview documentation discussing the techniques show in the examples in gtkmm-docmentation.
@@ -97,7 +95,6 @@ protected:
_CLASS_GOBJECT(Application, GtkApplication, GTK_APPLICATION, Gio::Application, GApplication)
protected:
-
/** Creates a new Application instance.
*
* This initializes gtkmm (and the GObject type system) for you.
@@ -120,6 +117,7 @@ protected:
public:
+ _WRAP_ENUM(InhibitFlags, GtkApplicationInhibitFlags)
/** Creates a new Application instance.
*
@@ -250,9 +248,9 @@ public:
_WRAP_METHOD(void set_menubar(const Glib::RefPtr<Gio::MenuModel>& menubar), gtk_application_set_menubar)
- _WRAP_METHOD(guint inhibit(Window& window, ApplicationInhibitFlags flags, const Glib::ustring& reason),
gtk_application_inhibit)
+ _WRAP_METHOD(guint inhibit(Window& window, InhibitFlags flags, const Glib::ustring& reason),
gtk_application_inhibit)
_WRAP_METHOD(void uninhibit(guint cookie), gtk_application_uninhibit)
- _WRAP_METHOD(bool is_inhibited(ApplicationInhibitFlags flags) const, gtk_application_is_inhibited)
+ _WRAP_METHOD(bool is_inhibited(InhibitFlags flags) const, gtk_application_is_inhibited)
_WRAP_METHOD(Window* get_window_by_id(guint id), gtk_application_get_window_by_id, refreturn)
_WRAP_METHOD(const Window* get_window_by_id(guint id) const, gtk_application_get_window_by_id, refreturn,
constversion)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index d6643cc..16ee7cd 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -159,7 +159,7 @@ _CONV_ENUM(Gtk,WrapBoxSpreading)
_CONV_ENUM(Gtk,SizeRequestMode)
_CONV_ENUM(Gtk,ScrollablePolicy)
_CONV_ENUM(Gtk,StateFlags)
-_CONV_ENUM(Gtk,ApplicationInhibitFlags)
+_CONV_INCLASS_ENUM(Gtk,Application,InhibitFlags)
_CONV_ENUM(Gtk,InputPurpose)
_CONV_ENUM(Gtk,InputHints)
_CONV_ENUM(Gtk,LevelBarMode)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]