Increment page sequence before print of the page, not after

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

diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 094d2aeee9e667f7282039c30d8764c063b71ccc..18302cae7766ea2b6b8296a1bef09ca97770b0a2 100644 (file)
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -18,11 +18,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_PAPER_SIZE_H__
 #define __GTK_PAPER_SIZE_H__
 
-#include <glib-object.h>
-#include "gtkenums.h"
+
+#include <gtk/gtkenums.h>
+
 
 G_BEGIN_DECLS
 
@@ -41,47 +46,55 @@ typedef struct _GtkPaperSize GtkPaperSize;
 
 GType gtk_paper_size_get_type (void) G_GNUC_CONST;
 
-GtkPaperSize *gtk_paper_size_new          (const char   *name);
-GtkPaperSize *gtk_paper_size_new_from_ppd (const char   *ppd_name,
-                                          const char   *ppd_display_name,
-                                          double        width,
-                                          double        height);
-GtkPaperSize *gtk_paper_size_new_custom   (const char   *name,
-                                          const char   *display_name,
-                                          double        width,
-                                          double        height,
+GtkPaperSize *gtk_paper_size_new          (const gchar  *name);
+GtkPaperSize *gtk_paper_size_new_from_ppd (const gchar  *ppd_name,
+                                          const gchar  *ppd_display_name,
+                                          gdouble       width,
+                                          gdouble       height);
+GtkPaperSize *gtk_paper_size_new_custom   (const gchar  *name,
+                                          const gchar  *display_name,
+                                          gdouble       width,
+                                          gdouble       height,
                                           GtkUnit       unit);
 GtkPaperSize *gtk_paper_size_copy         (GtkPaperSize *other);
 void          gtk_paper_size_free         (GtkPaperSize *size);
 gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
                                           GtkPaperSize *size2);
 
+GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
 
 /* The width is always the shortest side, measure in mm */
-G_CONST_RETURN char *   gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN char *   gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN char *   gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
+G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
-double   gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
-double   gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
+gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
+gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
 gboolean gtk_paper_size_is_custom        (GtkPaperSize *size);
 
 /* Only for custom sizes: */
-void gtk_paper_size_set_size             (GtkPaperSize *size, 
-                                          double        width, 
-                                          double        height, 
-                                          GtkUnit       unit);
-
-double gtk_paper_size_get_default_top_margin    (GtkPaperSize *size,
-                                                GtkUnit       unit);
-double gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size,
-                                                GtkUnit       unit);
-double gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
-                                                GtkUnit       unit);
-double gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
-                                                GtkUnit       unit);
-
-G_CONST_RETURN char * gtk_paper_size_get_default (void);
+void    gtk_paper_size_set_size                  (GtkPaperSize *size, 
+                                                  gdouble       width, 
+                                                  gdouble       height, 
+                                                  GtkUnit       unit);
+
+gdouble gtk_paper_size_get_default_top_margin    (GtkPaperSize *size,
+                                                 GtkUnit       unit);
+gdouble gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size,
+                                                 GtkUnit       unit);
+gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
+                                                 GtkUnit       unit);
+gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
+                                                 GtkUnit       unit);
+
+G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
+
+GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
+                                               const gchar *group_name,
+                                               GError     **error);
+void     gtk_paper_size_to_key_file            (GtkPaperSize *size,
+                                               GKeyFile     *key_file,
+                                               const gchar  *group_name);
 
 G_END_DECLS