diff options
| author | Alexander Larsson <alexl@redhat.com> | 2006-06-07 15:09:03 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2006-06-07 15:09:03 +0000 |
| commit | 9bea38595fcd9b4e9f55de3dcd5199dab930e713 (patch) | |
| tree | 1c5d2d561965a275c566abc8f1a083cc5cf46976 /gtk/gtkprintoperation-private.h | |
| parent | 36f7ed300ad786fc6ba88e9c7a7d771c689af06e (diff) | |
| download | gtk+-9bea38595fcd9b4e9f55de3dcd5199dab930e713.tar.gz | |
Clean up APIs: Make async a setting instead of separate calls. Combine
2006-06-07 Alexander Larsson <alexl@redhat.com>
* gtk/gtk.symbols:
* gtk/gtkprintoperation-private.h:
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintoperation.[ch]:
Clean up APIs:
Make async a setting instead of separate calls.
Combine settings like show_dialog, show_preview and pdf_target into
an action enum that you pass to gtk_print_dialog_run().
* tests/print-editor.c:
* tests/testnouiprint.c:
* tests/testprint.c:
* demos/gtk-demo/printing.c:
Update to new APIs
Diffstat (limited to 'gtk/gtkprintoperation-private.h')
| -rw-r--r-- | gtk/gtkprintoperation-private.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk/gtkprintoperation-private.h b/gtk/gtkprintoperation-private.h index dbc25bfa56..bc7117ed23 100644 --- a/gtk/gtkprintoperation-private.h +++ b/gtk/gtkprintoperation-private.h @@ -27,7 +27,9 @@ G_BEGIN_DECLS struct _GtkPrintOperationPrivate { + GtkPrintOperationAction action; GtkPrintStatus status; + GError *error; gchar *status_string; GtkPageSetup *default_page_setup; GtkPrintSettings *print_settings; @@ -37,11 +39,10 @@ struct _GtkPrintOperationPrivate GtkUnit unit; gchar *pdf_target; guint use_full_page : 1; - guint show_dialog : 1; - guint show_preview : 1; guint track_print_status : 1; guint show_progress : 1; guint cancelled : 1; + guint allow_async : 1; guint is_sync : 1; guint print_pages_idle_id; @@ -84,13 +85,15 @@ struct _GtkPrintOperationPrivate typedef void (* GtkPrintOperationPrintFunc) (GtkPrintOperation *op, GtkWindow *parent, - gboolean is_preview); + gboolean do_print, + GtkPrintOperationResult result); GtkPrintOperationResult _gtk_print_operation_platform_backend_run_dialog (GtkPrintOperation *operation, + gboolean show_dialog, GtkWindow *parent, - gboolean *do_print, - GError **error); + gboolean *do_print); void _gtk_print_operation_platform_backend_run_dialog_async (GtkPrintOperation *op, + gboolean show_dialog, GtkWindow *parent, GtkPrintOperationPrintFunc print_cb); void _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op, |