X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ft-test-one-sample.c;h=ccecb075ec8a7fafd2744b8c2bf2473f6f9d01dc;hb=00f87914f662b50bcb9eaf432e10ef5c3f486086;hp=ba27cf2ddddcb0ae94626076fae3474fe9999422;hpb=3b064b5cce148b1c7d5386553a87cda37913429f;p=pspp-builds.git

diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index ba27cf2d..ccecb075 100644
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.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"
@@ -60,7 +59,7 @@ generate_syntax (const struct tt_one_sample_dialog *d)
 
   g_string_append (str, "\n\t/VARIABLES=");
 
-  append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview));
+  append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview), 0);
 
   tt_options_dialog_append_syntax (d->opt, str);
 
@@ -127,13 +126,10 @@ t_test_one_sample_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, "one-sample-t-test-treeview2");
 
@@ -144,7 +140,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
 
   GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
 
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   tt_d.dict = vs->dict;
   tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
@@ -164,6 +160,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
 				 dict_view, tt_d.vars_treeview,
 				 insert_source_row_into_tree_view,
+				 NULL,
 				 NULL);