X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.h;h=93b51b0cee9aa7e5f7e973672869de8dd923e620;hb=a70c4580757c19cd5054a470c2c5d497a1e71b4c;hp=bd9f516ebe805485a13bba36765585d6a17c65c2;hpb=211e4f7fcacb8aab37e2fbc3e7387fb448f8eb56;p=pspp

diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h
index bd9f516ebe..93b51b0cee 100644
--- a/src/ui/gui/psppire-data-window.h
+++ b/src/ui/gui/psppire-data-window.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011  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
@@ -21,11 +21,12 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include "psppire-window.h"
-#include "psppire-data-editor.h"
 #include <gtk/gtk.h>
 
+#include "libpspp/ll.h"
+#include "ui/gui/psppire-window.h"
+#include "ui/gui/psppire-data-editor.h"
+
 G_BEGIN_DECLS
 
 #define PSPPIRE_DATA_WINDOW_TYPE            (psppire_data_window_get_type ())
@@ -50,6 +51,9 @@ struct _PsppireDataWindow
   PsppireDataEditor *data_editor;
   GtkBuilder *builder;
 
+  PsppireVarStore *var_store;
+  struct dataset *dataset;
+  PsppireDataStore *data_store;
 
   GtkAction *invoke_goto_dialog;
 
@@ -59,12 +63,11 @@ struct _PsppireDataWindow
   GtkAction *delete_cases;
 
 
-  GtkMenu *data_sheet_variable_popup_menu;
-  GtkMenu *data_sheet_cases_popup_menu;
-  GtkMenu *var_sheet_variable_popup_menu;
-
-
   gboolean save_as_portable;
+
+  struct ll ll;                 /* In global 'all_data_windows' list. */
+  unsigned long int lazy_serial;
+  unsigned int dataset_seqno;
 };
 
 struct _PsppireDataWindowClass
@@ -72,10 +75,21 @@ struct _PsppireDataWindowClass
   PsppireWindowClass parent_class;
 };
 
+extern struct session *the_session;
+extern struct ll_list all_data_windows;
+
 GType      psppire_data_window_get_type        (void);
-GtkWidget* psppire_data_window_new             (void);
-void       psppire_data_window_load_file (PsppireDataWindow *, const gchar *);
+GtkWidget* psppire_data_window_new             (struct dataset *);
+
+PsppireDataWindow *psppire_default_data_window (void);
+void psppire_data_window_set_default (PsppireDataWindow *);
+void psppire_data_window_undefault (PsppireDataWindow *);
+
+PsppireDataWindow *psppire_data_window_for_dataset (struct dataset *);
 
+bool psppire_data_window_is_empty (PsppireDataWindow *);
+void create_data_window (void);
+void open_data_window (PsppireWindow *victim, const char *file_name);
 
 G_END_DECLS