X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkpapersize.h;h=f7cf20da5e70116c4b99a3e19edbafb43072cf49;hb=190dcfe050814e979c364bf74ae83530aba4c686;hp=679915cdab0190b65c365f6d936ee7812030c5dc;hpb=60eca1efd800d61665f360e996247c9321639b44;p=~andy%2Fgtk

diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 679915cda..f7cf20da5 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -13,16 +13,19 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_PAPER_SIZE_H__
 #define __GTK_PAPER_SIZE_H__
 
-#include <glib-object.h>
-#include "gtkenums.h"
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkenums.h>
+
 
 G_BEGIN_DECLS
 
@@ -31,12 +34,53 @@ typedef struct _GtkPaperSize GtkPaperSize;
 #define GTK_TYPE_PAPER_SIZE    (gtk_paper_size_get_type ())
 
 /* Common names, from PWG 5101.1-2002 PWG: Standard for Media Standardized Names */
+/**
+ * GTK_PAPER_NAME_A3:
+ *
+ * Name for the A4 paper size.
+ */
 #define GTK_PAPER_NAME_A3 "iso_a3"
+
+/**
+ * GTK_PAPER_NAME_A4:
+ *
+ * Name for the A4 paper size.
+ */
 #define GTK_PAPER_NAME_A4 "iso_a4"
+
+/**
+ * GTK_PAPER_NAME_A5:
+ *
+ * Name for the A5 paper size.
+ */
 #define GTK_PAPER_NAME_A5 "iso_a5"
+
+/**
+ * GTK_PAPER_NAME_B5:
+ *
+ * Name for the B5 paper size.
+ */
 #define GTK_PAPER_NAME_B5 "iso_b5"
+
+/**
+ * GTK_PAPER_NAME_LETTER:
+ *
+ * Name for the Letter paper size.
+ */
 #define GTK_PAPER_NAME_LETTER "na_letter"
+
+/**
+ * GTK_PAPER_NAME_EXECUTIVE:
+ *
+ * Name for the Executive paper size.
+ */
 #define GTK_PAPER_NAME_EXECUTIVE "na_executive"
+
+/**
+ * GTK_PAPER_NAME_LEGAL:
+ *
+ * Name for the Legal paper size.
+ */
 #define GTK_PAPER_NAME_LEGAL "na_legal"
 
 GType gtk_paper_size_get_type (void) G_GNUC_CONST;
@@ -56,11 +100,12 @@ 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 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);
+const gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
 gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
 gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
@@ -81,7 +126,14 @@ gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
 gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
 						  GtkUnit       unit);
 
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
+const 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