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=22b4526c4d7027a2dccb8a235992d33fa1378427;hb=a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1;hp=d5f9eaa6406c7908f96f8f55f35269642f5d13e6;hpb=db2b1501c7ef5912183d51340740dd4bd2ee45ac;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 d5f9eaa6..22b4526c 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -17,7 +17,6 @@
 
 
 #include <config.h>
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 #include "t-test-independent-samples-dialog.h"
 #include "psppire-dict.h"
@@ -29,7 +28,7 @@
 #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"
@@ -91,7 +90,7 @@ tt_groups_dialog_destroy (struct tt_groups_dialog *grps)
 }
 
 static struct tt_groups_dialog *
-tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent)
+tt_groups_dialog_create (GtkBuilder *xml, GtkWindow *parent)
 {
   struct tt_groups_dialog *grps = xmalloc (sizeof (*grps));
 
@@ -127,7 +126,7 @@ tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent)
 
 struct tt_indep_samples_dialog
 {
-  GladeXML *xml;  /* The xml that generated the widgets */
+  GtkBuilder *xml;  /* The xml that generated the widgets */
   GtkWidget *dialog;
   PsppireDict *dict;
   GtkWidget *define_groups_button;
@@ -177,9 +176,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);
 	}
@@ -194,9 +192,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);
 	    }
@@ -398,7 +395,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
 
   PsppireVarStore *vs = NULL;
 
-  GladeXML *xml = XML_NEW ("t-test.glade");
+  GtkBuilder *xml = builder_new ("t-test.ui");
 
   GtkWidget *dict_view =
     get_widget_assert (xml, "indep-samples-t-test-treeview1");