X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.h;h=c3bcb84099e3c66bd7043b38b61787547d6b74ec;hb=635a88e82d0fd7fad47d00fb4dcfe3f7829dff02;hp=77687dc9c53a2098c68f300243a93fbb4fa1bc54;hpb=4398d3a1a881c6cafaeb0cbd11f56bd51d904c51;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h
index 77687dc9..c3bcb840 100644
--- a/src/ui/gui/psppire-data-window.h
+++ b/src/ui/gui/psppire-data-window.h
@@ -24,7 +24,6 @@
 #include <gtk/gtkaction.h>
 #include "psppire-window.h"
 #include "psppire-data-editor.h"
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
@@ -49,43 +48,10 @@ 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;
+  GtkBuilder *builder;
 
-  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;
-
-  GtkToggleAction *toggle_split_window;
-  GtkToggleAction *toggle_value_labels;
 
+  GtkAction *invoke_goto_dialog;
 
   GtkAction *insert_variable;
   GtkAction *insert_case;
@@ -93,17 +59,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
@@ -114,7 +70,6 @@ struct _PsppireDataWindowClass
 GType      psppire_data_window_get_type        (void);
 GtkWidget* psppire_data_window_new             (void);
 
-
 G_END_DECLS
 
 #endif /* __PSPPIRE_DATA_WINDOW_H__ */