gdk: Update gdk_settings_map for blink timeout to work

[~andy/gtk] / gtk / gtkprintoperation.h

diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index a1e24726e918ea4aabca331d46991dbfc8a38a46..bba15cc632887ee7dda49357f935d5f75747e22e 100644 (file)
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -18,22 +18,22 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
 #ifndef __GTK_PRINT_OPERATION_H__
 #define __GTK_PRINT_OPERATION_H__
 
-#include <glib-object.h>
+
 #include <cairo.h>
-#include "gtkmain.h"
-#include "gtkenums.h"
-#include "gtkwindow.h"
-#include "gtkpagesetup.h"
-#include "gtkprintsettings.h"
-#include "gtkprintcontext.h"
-#include "gtkprintoperationpreview.h"
+#include <gtk/gtkmain.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkpagesetup.h>
+#include <gtk/gtkprintsettings.h>
+#include <gtk/gtkprintcontext.h>
+#include <gtk/gtkprintoperationpreview.h>
+
 
 G_BEGIN_DECLS
 
@@ -78,19 +78,20 @@ typedef enum {
 struct _GtkPrintOperation
 {
   GObject parent_instance;
-  
+
+  /*< private >*/
   GtkPrintOperationPrivate *priv;
 };
 
 struct _GtkPrintOperationClass
 {
   GObjectClass parent_class;
-  
+
   void     (*done)               (GtkPrintOperation *operation,
                                  GtkPrintOperationResult result);
-  void     (*begin_print)        (GtkPrintOperation *operation, 
+  void     (*begin_print)        (GtkPrintOperation *operation,
                                  GtkPrintContext   *context);
-  gboolean (*paginate)           (GtkPrintOperation *operation, 
+  gboolean (*paginate)           (GtkPrintOperation *operation,
                                  GtkPrintContext   *context);
   void     (*request_page_setup) (GtkPrintOperation *operation,
                                  GtkPrintContext   *context,
@@ -105,13 +106,17 @@ struct _GtkPrintOperationClass
 
   GtkWidget *(*create_custom_widget) (GtkPrintOperation *operation);
   void       (*custom_widget_apply)  (GtkPrintOperation *operation,
-                                     GtkWidget *widget);
+                                     GtkWidget         *widget);
 
-  
   gboolean (*preview)       (GtkPrintOperation        *operation,
-                             GtkPrintOperationPreview *preview, 
+                             GtkPrintOperationPreview *preview,
                              GtkPrintContext          *context,
-                             GtkWindow                *parent);  
+                             GtkWindow                *parent);
+
+  void     (*update_custom_widget) (GtkPrintOperation *operation,
+                                    GtkWidget         *widget,
+                                    GtkPageSetup      *setup,
+                                    GtkPrintSettings  *settings);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -121,6 +126,7 @@ struct _GtkPrintOperationClass
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
   void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 #define GTK_PRINT_ERROR gtk_print_error_quark ()
@@ -173,12 +179,24 @@ GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOper
 G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
 gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
 void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
+void                    gtk_print_operation_draw_page_finish       (GtkPrintOperation  *op);
+void                    gtk_print_operation_set_defer_drawing      (GtkPrintOperation  *op);
+void                    gtk_print_operation_set_support_selection  (GtkPrintOperation  *op,
+                                                                    gboolean            support_selection);
+gboolean                gtk_print_operation_get_support_selection  (GtkPrintOperation  *op);
+void                    gtk_print_operation_set_has_selection      (GtkPrintOperation  *op,
+                                                                    gboolean            has_selection);
+gboolean                gtk_print_operation_get_has_selection      (GtkPrintOperation  *op);
+void                    gtk_print_operation_set_embed_page_setup   (GtkPrintOperation  *op,
+                                                                   gboolean            embed);
+gboolean                gtk_print_operation_get_embed_page_setup   (GtkPrintOperation  *op);
+gint                    gtk_print_operation_get_n_pages_to_print   (GtkPrintOperation  *op);
 
 GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow          *parent,
                                                                    GtkPageSetup       *page_setup,
                                                                    GtkPrintSettings   *settings);
 
-typedef void  (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup, 
+typedef void  (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup,
                                        gpointer      data);
 
 void                    gtk_print_run_page_setup_dialog_async      (GtkWindow            *parent,