X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.h;h=bc1b0f0b280770b87ae1414b7da4dc10b63c2e97;hb=4f66e6c17635237ca970fa383a77a763b02f16b2;hp=7831f53d2776dd8ccfb505ac32949324a1e43c34;hpb=9828d3a39e35f69e6e37159380a6fcbe6bba2f02;p=pspp

diff --git a/src/ui/gui/psppire-window.h b/src/ui/gui/psppire-window.h
index 7831f53d27..bc1b0f0b28 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, 2013  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
@@ -68,7 +68,6 @@ struct _PsppireWindow
   gchar *list_name;            /* Name for "Windows" menu list. */
 
   GHashTable *menuitem_table;
-  GtkMenuShell *menu;
 
   guint insert_handler;
   guint remove_handler;
@@ -91,7 +90,8 @@ struct _PsppireWindowIface
 
   void (*save) (PsppireWindow *w);
   void (*pick_filename) (PsppireWindow *);
-  gboolean (*load) (PsppireWindow *w, const gchar *, gpointer hint);
+  gboolean (*load) (PsppireWindow *w, const gchar *filename,
+                    const gchar *encoding, gpointer hint);
 };
 
 
@@ -112,11 +112,13 @@ 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, gpointer hint);
+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);
+void add_most_recent (const char *file_name, const char *mime_type,
+                      const char *encoding);
 
 G_END_DECLS