projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
[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 b3cff6be7143d7d9da574de56e1e76c8328795f5..13f3621092a06050fbe5be38e0084efbf1b1bbe5 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 "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"
#include "data-editor.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
@@
-129,15
+128,12
@@
oneway_anova_dialog (GObject *o, gpointer data)
gint response;
struct data_editor *de = data;
gint response;
struct data_editor *de = data;
- PsppireVarStore *vs;
+ PsppireVarStore *vs
= NULL
;
GladeXML *xml = XML_NEW ("oneway.glade");
struct oneway_anova_dialog ow;
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");
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"));
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;
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,
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,
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);
@@
-271,7
+269,7
@@
static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
GString *str = g_string_new ("ONEWAY /VARIABLES=");
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 ");
g_string_append (str, " BY ");