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 77687dc9c53a2098c68f300243a93fbb4fa1bc54..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,12 +21,13 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include "psppire-window.h"
-#include "psppire-data-editor.h"
-#include <glade/glade.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 ())
@@ -49,43 +50,13 @@ struct _PsppireDataWindow
 
   /* <private> */
   PsppireDataEditor *data_editor;
-  GladeXML *xml;
-  GtkAction *action_data_new;
-  GtkAction *action_data_open;
-  GtkAction *action_data_save_as;
-  GtkAction *action_data_save;
-
-  GtkAction *invoke_text_import_assistant;
-
-  /* Actions which invoke dialog boxes */
-  GtkAction *invoke_weight_cases_dialog;
-  GtkAction *invoke_transpose_dialog;
-  GtkAction *invoke_split_file_dialog;
-  GtkAction *invoke_sort_cases_dialog;
-  GtkAction *invoke_compute_dialog;
-  GtkAction *invoke_comments_dialog;
-  GtkAction *invoke_select_cases_dialog;
-  GtkAction *invoke_goto_dialog;
-  GtkAction *invoke_variable_info_dialog;
-  GtkAction *invoke_find_dialog;
-  GtkAction *invoke_rank_dialog;
-  GtkAction *invoke_recode_same_dialog;
-  GtkAction *invoke_recode_different_dialog;
-
-  GtkAction *invoke_crosstabs_dialog;
-  GtkAction *invoke_descriptives_dialog;
-  GtkAction *invoke_frequencies_dialog;
-  GtkAction *invoke_examine_dialog;
-  GtkAction *invoke_regression_dialog;
-
-  GtkAction *invoke_t_test_independent_samples_dialog;
-  GtkAction *invoke_t_test_paired_samples_dialog;
-  GtkAction *invoke_oneway_anova_dialog;
-  GtkAction *invoke_t_test_one_sample_dialog;
+  GtkBuilder *builder;
 
-  GtkToggleAction *toggle_split_window;
-  GtkToggleAction *toggle_value_labels;
+  PsppireVarStore *var_store;
+  struct dataset *dataset;
+  PsppireDataStore *data_store;
 
+  GtkAction *invoke_goto_dialog;
 
   GtkAction *insert_variable;
   GtkAction *insert_case;
@@ -93,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
@@ -112,8 +73,8 @@ struct _PsppireDataWindowClass
 };
 
 GType      psppire_data_window_get_type        (void);
-GtkWidget* psppire_data_window_new             (void);
-
+GtkWidget* psppire_data_window_new             (struct dataset *);
+PsppireDataWindow *psppire_default_data_window (void);
 
 G_END_DECLS