projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Add workaround for GTK+ 2.20 crash at startup.
[pspp]
/
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 ea390c334275f797b4069fd793b994d02b3827fa..8b91a5134d709274d2f37d8586a0e23871e9434f 100644
(file)
--- a/
src/ui/gui/oneway-anova-dialog.c
+++ b/
src/ui/gui/oneway-anova-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2010, 2011
Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,12
+15,12
@@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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 <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 "psppire-data-window.h"
#include "psppire-dialog.h"
#include "helper.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
@@
-29,8
+29,6
@@
#include "psppire-selector.h"
#include "dict-display.h"
#include "psppire-selector.h"
#include "dict-display.h"
-
-#include <language/syntax-string-source.h>
#include "executor.h"
#include "executor.h"
@@
-124,10
+122,9
@@
refresh (struct oneway_anova_dialog *ow)
/* Pops up the dialog box */
void
/* Pops up the dialog box */
void
-oneway_anova_dialog (
GObject *o, gpointer data
)
+oneway_anova_dialog (
PsppireDataWindow *de
)
{
gint response;
{
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs = NULL;
PsppireVarStore *vs = NULL;
@@
-141,9
+138,6
@@
oneway_anova_dialog (GObject *o, gpointer data)
GtkWidget *selector2 =
get_widget_assert (builder, "oneway-anova-selector2");
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");
GtkWidget *contrasts_button =
get_widget_assert (builder, "contrasts-button");
@@
-171,22
+165,11
@@
oneway_anova_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de));
gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de));
- g_object_set (dict_view, "dictionary", ow.dict, NULL);
-
- set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), ow.dict);
-
+ g_object_set (dict_view, "model", ow.dict, NULL);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
-
- psppire_selector_set_subjects (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);
g_signal_connect_swapped (ow.dialog, "refresh", G_CALLBACK (refresh), &ow);
@@
-227,22
+210,10
@@
oneway_anova_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&ow);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&ow)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&ow);
- paste_syntax_in_new_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&ow)));
break;
default:
break;
break;
default:
break;
@@
-263,7
+234,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), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (ow->vars_treeview), 0, str
);
g_string_append (str, " BY ");
g_string_append (str, " BY ");