New objects psppire-window and psppire-syntax-window.

[pspp-builds.git] / src / ui / gui / oneway-anova-dialog.c

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index f94756ec23808eda5f1187430c33c5cc14db5d0d..4db1e5ff6bccf8ea484c568f06f774bdfb9806eb 100644 (file)
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -23,7 +23,6 @@
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "helper.h"
-#include <gtksheet/gtksheet.h>
 #include "data-editor.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -32,7 +31,7 @@
 
 
 #include <language/syntax-string-source.h>
-#include "syntax-editor.h"
+#include "psppire-syntax-window.h"
 
 
 #include "gettext.h"
@@ -129,15 +128,12 @@ oneway_anova_dialog (GObject *o, gpointer data)
   gint response;
   struct data_editor *de = data;
 
-  PsppireVarStore *vs;
+  PsppireVarStore *vs = NULL;
 
   GladeXML *xml = XML_NEW ("oneway.glade");
 
   struct oneway_anova_dialog ow;
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
   GtkWidget *dict_view =
     get_widget_assert (xml, "oneway-anova-treeview1");
 
@@ -165,7 +161,7 @@ oneway_anova_dialog (GObject *o, gpointer data)
   ow.homogeneity =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "checkbutton2"));
 
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   ow.dict = vs->dict;
 
@@ -184,13 +180,15 @@ oneway_anova_dialog (GObject *o, gpointer data)
   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);
+                                is_currently_in_entry,
+                                NULL);
 
 
 
@@ -244,10 +242,11 @@ oneway_anova_dialog (GObject *o, gpointer data)
       {
        gchar *syntax = generate_syntax (&ow);
 
-       struct syntax_editor *se =
-         (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
+        GtkWidget *se = psppire_syntax_window_new ();
 
-       gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+       gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
+
+       gtk_widget_show (se);
 
        g_free (syntax);
       }
@@ -271,7 +270,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));
+  append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview), 0);
 
   g_string_append (str, " BY ");
 
@@ -371,6 +370,7 @@ list_store_changed (struct contrasts_subdialog *csd)
 }
 
 
+
 /* Copy the contrasts array into the local array */
 static GArray *
 clone_contrasts_array (GArray *src_array)
@@ -383,7 +383,7 @@ clone_contrasts_array (GArray *src_array)
 
   for (i = 0 ; i < src_array->len ; ++i )
     {
-      gboolean ok;
+
       GtkTreeIter src_iter;
       GtkListStore *src = g_array_index (src_array, GtkListStore*, i);
       GtkListStore *dest;
@@ -393,21 +393,7 @@ clone_contrasts_array (GArray *src_array)
                                           &src_iter))
        continue;
 
-      dest = gtk_list_store_new (1, G_TYPE_DOUBLE);
-
-      for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(src),
-                                              &src_iter);
-          ok;
-          ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (src), &src_iter))
-       {
-         gdouble v;
-         GtkTreeIter dest_iter;
-
-         gtk_tree_model_get (GTK_TREE_MODEL (src), &src_iter, 0, &v, -1);
-
-         gtk_list_store_append  (dest, &dest_iter);
-         gtk_list_store_set (dest, &dest_iter, 0, v, -1);
-       }
+      dest = clone_list_store (src);
 
       g_array_append_val (dest_array, dest);
     }