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=2da218e529058762dff7fe321848b4bb317189ff;hb=0c5217288cb57d0994d4c99997f5341e2c3a6871;hp=e5a04a076a22d833a2397a9b899c97ef695860ff;hpb=9a331fe64eb814ae5c1322e21717a04fb254bf65;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 e5a04a07..2da218e5 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,8 @@
 #include "t-test-independent-samples-dialog.h"
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
-#include "helper.h"
+#include "psppire-var-view.h"
+#include "executor.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -30,7 +31,6 @@
 #include "t-test-options.h"
 #include <ui/syntax-gen.h>
 
-#include <language/syntax-string-source.h>
 #include "helper.h"
 
 #include <gl/xalloc.h>
@@ -117,8 +117,8 @@ tt_groups_dialog_create (GtkBuilder *xml, GtkWindow *parent)
 
   gtk_window_set_transient_for (GTK_WINDOW (grps->dialog), parent);
 
-  grps->val[0] = strdup ("");
-  grps->val[1] = strdup ("");
+  grps->val[0] = xstrdup ("");
+  grps->val[1] = xstrdup ("");
 
   return grps;
 }
@@ -160,7 +160,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), 0);
+  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (tv), 0, str);
 
   g_string_append (str, "\n\t/GROUPS=");
 
@@ -340,10 +340,10 @@ run_define_groups (struct tt_indep_samples_dialog *ttd)
 	  grps->group_defn = GROUPS_VALUES;
 
 	  grps->val[0] =
-	    strdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[0])));
+	    xstrdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[0])));
 
 	  grps->val[1] =
-	    strdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[1])));
+	    xstrdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[1])));
 	}
       else
 	{
@@ -352,7 +352,7 @@ run_define_groups (struct tt_indep_samples_dialog *ttd)
 	  grps->val[1] = NULL;
 
 	  grps->val[0] =
-	    strdup (gtk_entry_get_text (GTK_ENTRY (grps->cut_point_entry)));
+	    xstrdup (gtk_entry_get_text (GTK_ENTRY (grps->cut_point_entry)));
 	}
 
       psppire_dialog_notify_change (PSPPIRE_DIALOG (ttd->dialog));
@@ -387,11 +387,10 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the dialog box */
 void
-t_test_independent_samples_dialog (GObject *o, gpointer data)
+t_test_independent_samples_dialog (PsppireDataWindow *de)
 {
   struct tt_indep_samples_dialog tt_d;
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   PsppireVarStore *vs = NULL;
 
@@ -400,9 +399,6 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
   GtkWidget *dict_view =
     get_widget_assert (xml, "indep-samples-t-test-treeview1");
 
-  GtkWidget *test_variables_treeview =
-    get_widget_assert (xml, "indep-samples-t-test-treeview2");
-
   GtkWidget *selector2 =
     get_widget_assert (xml, "indep-samples-t-test-selector2");
 
@@ -416,7 +412,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
 
   tt_d.dialog = get_widget_assert (xml, "t-test-independent-samples-dialog");
   tt_d.xml = xml;
-  tt_d.dict = vs->dict;
+  g_object_get (vs, "dictionary", &tt_d.dict, NULL);
 
   tt_d.define_groups_button = get_widget_assert (xml, "define-groups-button");
   tt_d.groups_entry = get_widget_assert (xml, "indep-samples-t-test-entry");
@@ -426,28 +422,14 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
 
   gtk_window_set_transient_for (GTK_WINDOW (tt_d.dialog), GTK_WINDOW (de));
 
-  g_object_set (dict_view, "dictionary", 
-				 vs->dict,
-				 NULL);
-
-  set_dest_model (GTK_TREE_VIEW (test_variables_treeview), vs->dict);
-
-
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-				 dict_view, test_variables_treeview,
-				 insert_source_row_into_tree_view,
-				 NULL,
-				 NULL);
+  g_object_set (dict_view, "model", tt_d.dict, NULL);
 
   psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
 			      numeric_only);
 
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-				 dict_view, tt_d.groups_entry,
-				 insert_source_row_into_entry,
-				 is_currently_in_entry,
-				 NULL);
+  psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
+				 is_currently_in_entry);
 
   g_signal_connect_swapped (tt_d.define_groups_button, "clicked",
 			    G_CALLBACK (run_define_groups), &tt_d);
@@ -472,21 +454,10 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-	gchar *syntax = generate_syntax (&tt_d);
-
-	struct getl_interface *sss = create_syntax_string_source (syntax);
-	execute_syntax (sss);
-
-	g_free (syntax);
-      }
+      g_free (execute_syntax_string (generate_syntax (&tt_d)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-	gchar *syntax = generate_syntax (&tt_d);
-        paste_syntax_in_new_window (syntax);
-	g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&tt_d)));
       break;
     default:
       break;