X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Foneway-anova-dialog.c;h=0d6f5aa546694fddf4c404427d2582119f61db60;hb=c0a213f7ed487273797d579bad952bca983240ba;hp=59b65b4a2487dfc1ce793381d407cc1e6cb402f9;hpb=a992bf1121d3e1eef76fd6184b95fe079bb91558;p=pspp

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index 59b65b4a24..0d6f5aa546 100644
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -15,22 +15,22 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include <config.h>
 #include <gtk/gtk.h>
 #include "oneway-anova-dialog.h"
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
+#include "psppire-var-view.h"
 #include "helper.h"
-#include "data-editor.h"
+#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 "syntax-editor.h"
+#include "executor.h"
 
 
 #include "gettext.h"
@@ -123,10 +123,9 @@ refresh (struct oneway_anova_dialog *ow)
 
 /* Pops up the dialog box */
 void
-oneway_anova_dialog (GObject *o, gpointer data)
+oneway_anova_dialog (PsppireDataWindow *de)
 {
   gint response;
-  struct data_editor *de = data;
 
   PsppireVarStore *vs = NULL;
 
@@ -140,9 +139,6 @@ oneway_anova_dialog (GObject *o, gpointer data)
   GtkWidget *selector2 =
     get_widget_assert (builder, "oneway-anova-selector2");
 
-  GtkWidget *selector1 =
-    get_widget_assert (builder, "oneway-anova-selector1");
-
   GtkWidget *contrasts_button =
     get_widget_assert (builder, "contrasts-button");
 
@@ -163,33 +159,18 @@ 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, de->parent.window);
-
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
-				 vs->dict,
-				 GTK_SELECTION_MULTIPLE, NULL);
+  gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de));
 
-  set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), vs->dict);
+  g_object_set (dict_view, "model", ow.dict, NULL);
 
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-				 dict_view, ow.vars_treeview,
-				 insert_source_row_into_tree_view,
-				 NULL,
-				 NULL);
-
-
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-				 dict_view, ow.factor_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 (ow.dialog, "refresh", G_CALLBACK (refresh),  &ow);
@@ -222,7 +203,7 @@ oneway_anova_dialog (GObject *o, gpointer data)
     psppire_acr_set_entry (cd->acr, entry);
 
     gtk_window_set_transient_for (GTK_WINDOW (cd->contrasts_dialog),
-				  de->parent.window);
+				  GTK_WINDOW (de));
   }
 
   response = psppire_dialog_run (PSPPIRE_DIALOG (ow.dialog));
@@ -232,6 +213,7 @@ oneway_anova_dialog (GObject *o, gpointer data)
     case GTK_RESPONSE_OK:
       {
 	gchar *syntax = generate_syntax (&ow);
+
 	struct getl_interface *sss = create_syntax_string_source (syntax);
 	execute_syntax (sss);
 
@@ -241,11 +223,7 @@ oneway_anova_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (&ow);
-
-	struct syntax_editor *se =
-	  (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
-	gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+        paste_syntax_to_window (syntax);
 
 	g_free (syntax);
       }
@@ -269,7 +247,7 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
 
   GString *str = g_string_new ("ONEWAY /VARIABLES=");
 
-  append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview), 0);
+  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (ow->vars_treeview), 0, str);
 
   g_string_append (str, " BY ");