Merge commit 'origin/master' into charset

[pspp-builds.git] / src / ui / gui / psppire-window.h

diff --git a/src/ui/gui/psppire-window.h b/src/ui/gui/psppire-window.h
index e3da271e237208dd3bced081c0d1c7da8773099b..441e12af3f2454eaa7c3aae16e5fba181e9343b7 100644 (file)
--- a/src/ui/gui/psppire-window.h
+++ b/src/ui/gui/psppire-window.h
@@ -72,7 +72,9 @@ struct _PsppireWindow
 
   guint insert_handler;
   guint remove_handler;
-  gboolean unsaved;
+
+  gboolean dirty;
+  GTimeVal savetime;
 };
 
 
@@ -87,6 +89,7 @@ struct _PsppireWindowIface
   GTypeInterface g_iface;
 
   void (*save) (PsppireWindow *w);
+  gboolean (*load) (PsppireWindow *w, const gchar *);
 };
 
 
@@ -99,15 +102,14 @@ void psppire_window_set_filename (PsppireWindow *w, const gchar *filename);
 
 void psppire_window_minimise_all (void);
 
-void psppire_window_set_unsaved (PsppireWindow *, gboolean );
+void psppire_window_set_unsaved (PsppireWindow *);
 
 gboolean psppire_window_get_unsaved (PsppireWindow *);
 
 gint psppire_window_query_save (PsppireWindow *);
 
 void psppire_window_save (PsppireWindow *w);
-
-void add_most_recent (const char *file_name, GtkRecentManager *rm);
+gboolean psppire_window_load (PsppireWindow *w, const gchar *file);
 
 
 G_END_DECLS