X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.h;h=c65823a298e8c8063864675effab322bf78ecd3d;hb=e870838d34e5e0133997434d27035054c605fb4f;hp=0aa913c1f99edffcc23e51b59dbab1016dc574b9;hpb=e195fccfab97205acb29f90fd1168488d49f1573;p=pspp

diff --git a/src/ui/gui/psppire-window.h b/src/ui/gui/psppire-window.h
index 0aa913c1f9..c65823a298 100644
--- a/src/ui/gui/psppire-window.h
+++ b/src/ui/gui/psppire-window.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include "psppire-window-base.h"
 
 G_BEGIN_DECLS
 
@@ -57,7 +58,7 @@ typedef struct _PsppireWindowIface  PsppireWindowIface;
 
 struct _PsppireWindow
 {
-  GtkWindow parent;
+  PsppireWindowBase parent;
 
   /* <private> */
   gchar *filename;             /* File name, in file name encoding, or NULL. */
@@ -67,11 +68,11 @@ struct _PsppireWindow
   gchar *list_name;            /* Name for "Windows" menu list. */
 
   GHashTable *menuitem_table;
-  GtkMenuShell *menu;
 
   guint insert_handler;
   guint remove_handler;
 
+  gboolean added_separator;
   gboolean dirty;
   GTimeVal savetime;
 };
@@ -79,7 +80,7 @@ struct _PsppireWindow
 
 struct _PsppireWindowClass
 {
-  GtkWindowClass parent_class;
+  PsppireWindowBaseClass parent_class;
 };
 
 
@@ -89,7 +90,8 @@ struct _PsppireWindowIface
 
   void (*save) (PsppireWindow *w);
   void (*pick_filename) (PsppireWindow *);
-  gboolean (*load) (PsppireWindow *w, const gchar *);
+  gboolean (*load) (PsppireWindow *w, const gchar *filename,
+                    const gchar *encoding, gpointer hint);
 };
 
 
@@ -110,10 +112,15 @@ gint psppire_window_query_save (PsppireWindow *);
 
 void psppire_window_save (PsppireWindow *w);
 void psppire_window_save_as (PsppireWindow *w);
-gboolean psppire_window_load (PsppireWindow *w, const gchar *file);
+gboolean psppire_window_load (PsppireWindow *w, const gchar *file,
+                              const gchar *encoding, gpointer hint);
 void psppire_window_open (PsppireWindow *de);
 GtkWidget *psppire_window_file_chooser_dialog (PsppireWindow *toplevel);
 
+void add_most_recent (const char *file_name, const char *mime_type,
+                      const char *encoding);
+
+void read_spv_file (const char *filename);
 
 G_END_DECLS