[gtkmm] Assistant: Change AssistantPageType to Assistant::PageType.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Assistant: Change AssistantPageType to Assistant::PageType.
- Date: Thu, 27 Apr 2017 15:27:34 +0000 (UTC)
commit 702b11e4521a7615c8afae5a132dc67951c2fdd1
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 27 14:27:38 2017 +0200
Assistant: Change AssistantPageType to Assistant::PageType.
gtk/src/assistant.ccg | 2 +-
gtk/src/assistant.hg | 10 +++++-----
tools/m4/convert_gtk.m4 | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/src/assistant.ccg b/gtk/src/assistant.ccg
index d7802f8..bd60ab2 100644
--- a/gtk/src/assistant.ccg
+++ b/gtk/src/assistant.ccg
@@ -18,7 +18,7 @@
#include <gtk/gtk.h>
-
+using PageType = Gtk::Assistant::PageType;
static gint SignalProxy_SlotForwardPage_gtk_callback(gint current_page, gpointer data)
{
diff --git a/gtk/src/assistant.hg b/gtk/src/assistant.hg
index 3642cb1..98667ee 100644
--- a/gtk/src/assistant.hg
+++ b/gtk/src/assistant.hg
@@ -25,8 +25,6 @@ _PINCLUDE(gtkmm/private/window_p.h)
namespace Gtk
{
-_WRAP_ENUM(AssistantPageType, GtkAssistantPageType)
-
/** A widget used to guide users through multi-step operations.
*
* A %Gtk::Assistant is a widget used to represent a generally complex
@@ -41,6 +39,8 @@ class Assistant : public Window
_CLASS_GTKOBJECT(Assistant, GtkAssistant, GTK_ASSISTANT, Gtk::Window, GtkWindow)
_UNMANAGEABLE
public:
+ _WRAP_ENUM(PageType, GtkAssistantPageType)
+
_CTOR_DEFAULT()
/** Constructor.
@@ -70,8 +70,8 @@ public:
void set_forward_page_func(const SlotForwardPage& slot);
_IGNORE(gtk_assistant_set_forward_page_func)
- _WRAP_METHOD(void set_page_type(const Widget& page, AssistantPageType type), gtk_assistant_set_page_type)
- _WRAP_METHOD(AssistantPageType get_page_type(const Widget& page) const, gtk_assistant_get_page_type)
+ _WRAP_METHOD(void set_page_type(const Widget& page, PageType type), gtk_assistant_set_page_type)
+ _WRAP_METHOD(PageType get_page_type(const Widget& page) const, gtk_assistant_get_page_type)
_WRAP_METHOD(void set_page_title(const Widget& page, const Glib::ustring& title),
gtk_assistant_set_page_title)
_WRAP_METHOD(Glib::ustring get_page_title(const Widget& page) const, gtk_assistant_get_page_title)
@@ -95,7 +95,7 @@ public:
_WRAP_PROPERTY("use-header-bar", bool)
- _WRAP_CHILD_PROPERTY("page-type", AssistantPageType, newin "3,90")
+ _WRAP_CHILD_PROPERTY("page-type", PageType, newin "3,90")
_WRAP_CHILD_PROPERTY("title", Glib::ustring, newin "3,90")
_WRAP_CHILD_PROPERTY("complete", bool, newin "3,90")
_WRAP_CHILD_PROPERTY("has-padding", bool, newin "3,90")
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 16ee7cd..1b3c790 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -134,7 +134,7 @@ _CONV_ENUM(Gtk,IconLookupFlags)
_CONV_ENUM(Gtk,IconThemeError)
_CONV_ENUM(Gtk,FileChooserConfirmation)
_CONV_ENUM(Gtk,SensitivityType)
-_CONV_ENUM(Gtk,AssistantPageType)
+_CONV_INCLASS_ENUM(Gtk,Assistant,PageType)
_CONV_ENUM(Gtk,IconViewDropPosition)
_CONV_ENUM(Gtk,RecentFilterFlags)
_CONV_ENUM(Gtk,RecentManagerError)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]