[gtkmm] FileChooser: Change FileChooserConfirmation to FileChooser::Confirmation.



commit 8c5c3373b5bb782e8f608735a6221e06a3fdd5b7
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 22:15:15 2017 +0200

    FileChooser: Change FileChooserConfirmation to FileChooser::Confirmation.

 gtk/src/filechooser.ccg |    1 +
 gtk/src/filechooser.hg  |    5 ++---
 tools/m4/convert_gtk.m4 |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/src/filechooser.ccg b/gtk/src/filechooser.ccg
index 66aa79c..6bcf36d 100644
--- a/gtk/src/filechooser.ccg
+++ b/gtk/src/filechooser.ccg
@@ -20,6 +20,7 @@
 #include <gtk/gtk.h>
 
 using Action = Gtk::FileChooser::Action;
+using Confirmation = Gtk::FileChooser::Confirmation;
 
 namespace Gtk
 {
diff --git a/gtk/src/filechooser.hg b/gtk/src/filechooser.hg
index 78593a9..3ce5788 100644
--- a/gtk/src/filechooser.hg
+++ b/gtk/src/filechooser.hg
@@ -27,8 +27,6 @@ _PINCLUDE(glibmm/private/interface_p.h)
 namespace Gtk
 {
 
-_WRAP_ENUM(FileChooserConfirmation, GtkFileChooserConfirmation)
-
 //Note that GTK_FILE_SYSTEM_ERROR is not currently public GTK+ API and should
 //never be instantiated by the GTK+ C API.
 
@@ -64,6 +62,7 @@ class FileChooser : public Glib::Interface
   _CLASS_INTERFACE(FileChooser, GtkFileChooser, GTK_FILE_CHOOSER, GtkFileChooserClass)
 public:
   _WRAP_ENUM(Action, GtkFileChooserAction)
+  _WRAP_ENUM(Confirmation, GtkFileChooserConfirmation)
 
   _WRAP_METHOD(void set_action(Action action), gtk_file_chooser_set_action)
   _WRAP_METHOD(Action get_action() const, gtk_file_chooser_get_action)
@@ -207,7 +206,7 @@ public:
   _WRAP_SIGNAL(void selection_changed(), "selection_changed", no_default_handler)
   _WRAP_SIGNAL(void update_preview(), "update_preview", no_default_handler)
   _WRAP_SIGNAL(void file_activated(), "file_activated", no_default_handler)
-  _WRAP_SIGNAL(FileChooserConfirmation confirm_overwrite(), "confirm-overwrite", no_default_handler)
+  _WRAP_SIGNAL(Confirmation confirm_overwrite(), "confirm-overwrite", no_default_handler)
 
   _WRAP_PROPERTY("action", Action)
   _WRAP_PROPERTY("filter", Glib::RefPtr<FileFilter>)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 560a8b2..3de540c 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -129,10 +129,10 @@ _CONV_ENUM(Gtk,WindowPosition)
 _CONV_ENUM(Gtk,WindowType)
 _CONV_ENUM(Gtk,WrapMode)
 _CONV_INCLASS_ENUM(Gtk,FileChooser,Action)
+_CONV_INCLASS_ENUM(Gtk,FileChooser,Confirmation)
 _CONV_INCLASS_ENUM(Gtk,FileFilter,Flags)
 _CONV_ENUM(Gtk,IconLookupFlags)
 _CONV_ENUM(Gtk,IconThemeError)
-_CONV_ENUM(Gtk,FileChooserConfirmation)
 _CONV_ENUM(Gtk,SensitivityType)
 _CONV_INCLASS_ENUM(Gtk,Assistant,PageType)
 _CONV_INCLASS_ENUM(Gtk,IconView,DropPosition)


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