[gtkmm] PrintOperation: Change PrintOperationAction to PrintOperation::Action.



commit 7c38fe703d8b6a670f5fab8c62de9fcf06bea9fd
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 22:10:34 2017 +0200

    PrintOperation: Change PrintOperationAction to PrintOperation::Action.

 gtk/src/printoperation.ccg |    2 +-
 gtk/src/printoperation.hg  |    8 ++++----
 tools/m4/convert_gtk.m4    |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/src/printoperation.ccg b/gtk/src/printoperation.ccg
index 87054aa..cf06fbc 100644
--- a/gtk/src/printoperation.ccg
+++ b/gtk/src/printoperation.ccg
@@ -43,7 +43,7 @@ namespace Gtk
 {
 
 PrintOperation::Result
-PrintOperation::run(PrintOperationAction action)
+PrintOperation::run(Action action)
 {
   GError* gerror = nullptr;
   Result res =
diff --git a/gtk/src/printoperation.hg b/gtk/src/printoperation.hg
index b346079..943a7f0 100644
--- a/gtk/src/printoperation.hg
+++ b/gtk/src/printoperation.hg
@@ -31,7 +31,6 @@ namespace Gtk
 {
 
 _WRAP_ENUM(PrintStatus, GtkPrintStatus)
-_WRAP_ENUM(PrintOperationAction, GtkPrintOperationAction)
 _WRAP_GERROR(PrintError, GtkPrintError, GTK_PRINT_ERROR)
 
 /** @defgroup Printing Printing
@@ -68,6 +67,7 @@ protected:
 
 public:
   _WRAP_ENUM(Result, GtkPrintOperationResult)
+  _WRAP_ENUM(Action, GtkPrintOperationAction)
 
   _WRAP_CREATE()
 
@@ -94,13 +94,13 @@ public:
   _WRAP_METHOD(void set_allow_async(bool allow_async = true), gtk_print_operation_set_allow_async)
   _WRAP_METHOD(void set_custom_tab_label(const Glib::ustring& label), 
gtk_print_operation_set_custom_tab_label)
 
-  #m4 _CONVERSION(`GtkPrintOperationAction',`PrintOperationAction',`($2)$3')
+  #m4 _CONVERSION(`GtkPrintOperationAction',`Action',`($2)$3')
 
   /** See the run() method that takes both action and parent parameters.
    */
-  Result run(PrintOperationAction action = PrintOperationAction::PRINT_DIALOG);
+  Result run(Action action = Action::PRINT_DIALOG);
 
-  _WRAP_METHOD(Result run(PrintOperationAction action, Window& parent), gtk_print_operation_run, errthrow)
+  _WRAP_METHOD(Result run(Action action, Window& parent), gtk_print_operation_run, errthrow)
 
   _WRAP_METHOD(PrintStatus get_status() const, gtk_print_operation_get_status)
   _WRAP_METHOD(Glib::ustring get_status_string() const, gtk_print_operation_get_status_string)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index f4e2fa0..32e1dfa 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -147,7 +147,7 @@ _CONV_ENUM(Gtk,PrintPages)
 _CONV_ENUM(Gtk,PageSet)
 _CONV_ENUM(Gtk,PrintStatus)
 _CONV_INCLASS_ENUM(Gtk,PrintOperation,Result)
-_CONV_ENUM(Gtk,PrintOperationAction)
+_CONV_INCLASS_ENUM(Gtk,PrintOperation,Action)
 _CONV_ENUM(Gtk,PrintError)
 _CONV_ENUM(Gtk,PrintCapabilities)
 _CONV_ENUM(Gtk,DragResult)


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