Separated psppire_selector_set_subjects into two individual functions

[pspp-builds.git] / src / ui / gui / t-test-paired-samples.c

diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c
index ca1d776a7294f6bed0b91060e4be8f7878ef4b2c..a021ce2c3897e19368a3b87468d3f4ce80c4479b 100644 (file)
--- a/src/ui/gui/t-test-paired-samples.c
+++ b/src/ui/gui/t-test-paired-samples.c
@@ -20,16 +20,18 @@
 #include <language/syntax-string-source.h>
 
 #include "psppire-data-window.h"
+#include "psppire-selector.h"
 
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "t-test-paired-samples.h"
 #include "t-test-options.h"
 
-#include "dict-display.h"
 #include "dialog-common.h"
 #include "psppire-dialog.h"
 
+#include "executor.h"
+
 #include "helper.h"
 
 #include "psppire-var-ptr.h"
@@ -197,7 +199,7 @@ t_test_paired_samples_dialog (GObject *o, gpointer data)
 
   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.pairs_treeview =
    get_widget_assert (xml, "paired-samples-t-test-treeview2");
   tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
@@ -205,10 +207,9 @@ t_test_paired_samples_dialog (GObject *o, gpointer data)
   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, "model", tt_d.dict,
+               "predicate",
+               var_is_numeric, NULL);
 
   {
     tt_d.list_store =
@@ -227,13 +228,9 @@ t_test_paired_samples_dialog (GObject *o, gpointer data)
   }
 
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
-                                dict_view,
-                                tt_d.pairs_treeview,
-                                select_as_pair_member,
-                                NULL,
-                                &tt_d);
-
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
+                                   select_as_pair_member,
+                                   &tt_d);
 
   g_signal_connect_swapped (dialog, "refresh",
                            G_CALLBACK (refresh),  &tt_d);