X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ft-test-one-sample.c;h=8b2d8af795e055552e3cec44981e1e6b5f2ed4f9;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=f92a32f92eaf3c3dcd39e71e01368a641cf24518;hpb=0bd0098aec2ee31d9460c8d4c1263d0b5ccc4324;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 f92a32f9..8b2d8af7 100644
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -17,22 +17,20 @@
 
 
 #include <config.h>
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 #include "t-test-one-sample.h"
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "helper.h"
-#include <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
 #include "dict-display.h"
 #include "widget-io.h"
+#include "executor.h"
 
 #include "t-test-options.h"
 #include <language/syntax-string-source.h>
-#include "syntax-editor.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -125,14 +123,11 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
 {
   struct tt_one_sample_dialog tt_d;
   gint response;
-  struct data_editor *de = data;
+  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (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"));
+  GtkBuilder *xml = builder_new ("t-test.ui");
 
   GtkWidget *dict_view =
     get_widget_assert (xml, "one-sample-t-test-treeview2");
@@ -144,21 +139,21 @@ 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;
+  g_object_get (vs, "dictionary", &tt_d.dict, NULL);
   tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
   tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
-  tt_d.opt = tt_options_dialog_create (xml, de->parent.window);
+  tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
-				 vs->dict,
-				 GTK_SELECTION_MULTIPLE,
-				 var_is_numeric);
+  g_object_set (dict_view, "dictionary",
+		tt_d.dict,
+		"predicate",
+		var_is_numeric, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), tt_d.dict);
 
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
@@ -185,6 +180,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
     case GTK_RESPONSE_OK:
       {
 	gchar *syntax = generate_syntax (&tt_d);
+
 	struct getl_interface *sss = create_syntax_string_source (syntax);
 	execute_syntax (sss);
 
@@ -195,10 +191,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
       {
 	gchar *syntax = generate_syntax (&tt_d);
 
-	struct syntax_editor *se =
-	  (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
-	gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+        paste_syntax_in_new_window (syntax);
 
 	g_free (syntax);
       }