X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ft-test-independent-samples-dialog.c;h=9c3ea41daeb3f4511884ac6be6c6a359ad2af7f7;hb=123d16d68da74c02aca66ba3896e5ec2d33efbc0;hp=74b43cc1dba7d84987ea33021a56063d343d8274;hpb=0bd0098aec2ee31d9460c8d4c1263d0b5ccc4324;p=pspp-builds.git

diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index 74b43cc1..9c3ea41d 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -23,14 +23,13 @@
 #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"
 #include "dict-display.h"
 #include "widget-io.h"
 #include "t-test-options.h"
-#include <libpspp/syntax-gen.h>
+#include <ui/syntax-gen.h>
 
 #include <language/syntax-string-source.h>
 #include "syntax-editor.h"
@@ -178,9 +177,8 @@ generate_syntax (const struct tt_indep_samples_dialog *d)
 
       if ( var_is_alpha (group_variable))
 	{
-	  struct string s;
-	  ds_init_cstr (&s, d->grps->val[0]);
-	  gen_quoted_string (&s);
+	  struct string s = DS_EMPTY_INITIALIZER;
+	  syntax_gen_string (&s, ss_cstr (d->grps->val[0]));
 	  g_string_append (str, ds_cstr (&s));
 	  ds_destroy (&s);
 	}
@@ -195,9 +193,8 @@ generate_syntax (const struct tt_indep_samples_dialog *d)
 
 	  if ( var_is_alpha (group_variable))
 	    {
-	      struct string s;
-	      ds_init_cstr (&s, d->grps->val[1]);
-	      gen_quoted_string (&s);
+	      struct string s = DS_EMPTY_INITIALIZER;
+	      syntax_gen_string (&s, ss_cstr (d->grps->val[1]));
 	      g_string_append (str, ds_cstr (&s));
 	      ds_destroy (&s);
 	    }
@@ -397,13 +394,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 +411,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;