Remove unnecessary dependencies on gtksheet.h

[pspp-builds.git] / src / ui / gui / t-test-independent-samples-dialog.c

diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index 9a396d9b669c1926ae4b6794534b90f8fffb1cf7..d5f9eaa6406c7908f96f8f55f35269642f5d13e6 100644 (file)
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -23,7 +23,6 @@
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "helper.h"
-#include <gtksheet/gtksheet.h>
 #include "data-editor.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -162,7 +161,7 @@ generate_syntax (const struct tt_indep_samples_dialog *d)
 
   GString *str = g_string_new ("T-TEST /VARIABLES=");
 
-  append_variable_names (str, d->dict, GTK_TREE_VIEW (tv));
+  append_variable_names (str, d->dict, GTK_TREE_VIEW (tv), 0);
 
   g_string_append (str, "\n\t/GROUPS=");
 
@@ -397,13 +396,10 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
   gint response;
   struct data_editor *de = data;
 
-  PsppireVarStore *vs;
+  PsppireVarStore *vs = NULL;
 
   GladeXML *xml = XML_NEW ("t-test.glade");
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
   GtkWidget *dict_view =
     get_widget_assert (xml, "indep-samples-t-test-treeview1");
 
@@ -417,9 +413,9 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
     get_widget_assert (xml, "indep-samples-t-test-selector1");
 
   GtkWidget *options_button =
-    get_widget_assert (xml, "options-button");
+    get_widget_assert (xml, "indep-samples-t-test-options-button");
 
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   tt_d.dialog = get_widget_assert (xml, "t-test-independent-samples-dialog");
   tt_d.xml = xml;
@@ -443,6 +439,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
                                 dict_view, test_variables_treeview,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);
 
   psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
@@ -452,7 +449,8 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
                                 dict_view, tt_d.groups_entry,
                                 insert_source_row_into_entry,
-                                is_currently_in_entry);
+                                is_currently_in_entry,
+                                NULL);
 
   g_signal_connect_swapped (tt_d.define_groups_button, "clicked",
                            G_CALLBACK (run_define_groups), &tt_d);