filechooserbutton: Update the combo box even after the dialog is cancelled

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

diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index db617a2c7698902428217407151380fccd152f96..86a414e7ab3a25d393621ac2aa28c3a8132bd1ab 100644 (file)
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -13,17 +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_PAGE_SETUP_H__
 #define __GTK_PAGE_SETUP_H__
 
-#include <glib-object.h>
-#include "gtkenums.h"
-#include "gtkpapersize.h"
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkpapersize.h>
+
 
 G_BEGIN_DECLS
 
@@ -42,43 +44,62 @@ void               gtk_page_setup_set_orientation   (GtkPageSetup       *setup,
 GtkPaperSize *     gtk_page_setup_get_paper_size    (GtkPageSetup       *setup);
 void               gtk_page_setup_set_paper_size    (GtkPageSetup       *setup,
                                                     GtkPaperSize       *size);
-double             gtk_page_setup_get_top_margin    (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_top_margin    (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 void               gtk_page_setup_set_top_margin    (GtkPageSetup       *setup,
-                                                    double              margin,
+                                                    gdouble             margin,
                                                     GtkUnit             unit);
-double             gtk_page_setup_get_bottom_margin (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_bottom_margin (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 void               gtk_page_setup_set_bottom_margin (GtkPageSetup       *setup,
-                                                    double              margin,
+                                                    gdouble             margin,
                                                     GtkUnit             unit);
-double             gtk_page_setup_get_left_margin   (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_left_margin   (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 void               gtk_page_setup_set_left_margin   (GtkPageSetup       *setup,
-                                                    double              margin,
+                                                    gdouble             margin,
                                                     GtkUnit             unit);
-double             gtk_page_setup_get_right_margin  (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_right_margin  (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 void               gtk_page_setup_set_right_margin  (GtkPageSetup       *setup,
-                                                    double              margin,
+                                                    gdouble             margin,
                                                     GtkUnit             unit);
 
-void gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup *setup,
-                                                       GtkPaperSize *size);
+void gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup    *setup,
+                                                       GtkPaperSize    *size);
 
 /* These take orientation, but not margins into consideration */
-double             gtk_page_setup_get_paper_width   (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_paper_width   (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
-double             gtk_page_setup_get_paper_height  (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_paper_height  (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 
 
 /* These take orientation, and margins into consideration */
-double             gtk_page_setup_get_page_width    (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_page_width    (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
-double             gtk_page_setup_get_page_height   (GtkPageSetup       *setup,
+gdouble            gtk_page_setup_get_page_height   (GtkPageSetup       *setup,
                                                     GtkUnit             unit);
 
+/* Saving and restoring page setup */
+GtkPageSetup     *gtk_page_setup_new_from_file     (const gchar         *file_name,
+                                                    GError              **error);
+gboolean          gtk_page_setup_load_file         (GtkPageSetup        *setup,
+                                                    const char          *file_name,
+                                                    GError             **error);
+gboolean          gtk_page_setup_to_file           (GtkPageSetup        *setup,
+                                                    const char          *file_name,
+                                                    GError             **error);
+GtkPageSetup     *gtk_page_setup_new_from_key_file (GKeyFile            *key_file,
+                                                    const gchar         *group_name,
+                                                    GError             **error);
+gboolean           gtk_page_setup_load_key_file     (GtkPageSetup        *setup,
+                                                    GKeyFile            *key_file,
+                                                    const gchar         *group_name,
+                                                    GError             **error);
+void              gtk_page_setup_to_key_file       (GtkPageSetup        *setup,
+                                                    GKeyFile            *key_file,
+                                                    const gchar         *group_name);
 
 G_END_DECLS