gui: Eliminate dataset-related global variables.

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

diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h
index ecf86bb9abbf48c5b5cd848c2a123ac312e2c2f2..0100254386adf3dd9085a0d9954555bbfe51fa76 100644 (file)
--- 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  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,13 @@
 
 #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 "ui/gui/psppire-window.h"
+#include "ui/gui/psppire-data-editor.h"
+
+struct dataset;
+
 G_BEGIN_DECLS
 
 #define PSPPIRE_DATA_WINDOW_TYPE            (psppire_data_window_get_type ())
@@ -50,6 +52,9 @@ struct _PsppireDataWindow
   PsppireDataEditor *data_editor;
   GtkBuilder *builder;
 
+  PsppireVarStore *var_store;
+  struct dataset *dataset;
+  PsppireDataStore *data_store;
 
   GtkAction *invoke_goto_dialog;
 
@@ -59,17 +64,7 @@ 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;
-
-  /* Name of the file this data is associated with (ie, was loaded from or
-     has been  saved to), in "filename encoding",  or NULL, if it's not
-     associated with any file */
-  gchar *file_name;
 };
 
 struct _PsppireDataWindowClass
@@ -78,9 +73,8 @@ struct _PsppireDataWindowClass
 };
 
 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);
 
 G_END_DECLS