X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Foneway-anova-dialog.c;h=e1e3c5aeca6542b7cdc48b22cdca3d1113fc37a1;hb=c81ed3d3c60ca7d576ef9d3d9c9d6863d6f11bf5;hp=a2b47fa5e5d33884c8ce201f3f58f86313512b44;hpb=c3e2ab6b50eb3b3c7e0852f2a4e2122f695714ff;p=pspp-builds.git

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index a2b47fa5..e1e3c5ae 100644
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -25,12 +25,13 @@
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
-#include "dict-display.h"
 #include "psppire-acr.h"
+#include "psppire-selector.h"
+#include "dict-display.h"
 
 
 #include <language/syntax-string-source.h>
-#include "helper.h"
+#include "executor.h"
 
 
 #include "gettext.h"
@@ -163,32 +164,31 @@ oneway_anova_dialog (GObject *o, gpointer data)
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
 
-  ow.dict = vs->dict;
+  g_object_get (vs, "dictionary", &ow.dict, NULL);
 
   ow.dialog =
     GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
 
   gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de));
 
-  g_object_set (dict_view, "model", vs->dict, NULL);
+  g_object_set (dict_view, "model", ow.dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), ow.dict);
 
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-				 dict_view, ow.vars_treeview,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector1),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);
 
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-				 dict_view, ow.factor_entry,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector2),
 				 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 (ow.dialog, "refresh", G_CALLBACK (refresh),  &ow);