projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not rely on user to specify all variables in VARIABLE subcommand. Fixes bug 30389.
[pspp]
/
src
/
ui
/
gui
/
correlation-dialog.c
diff --git
a/src/ui/gui/correlation-dialog.c
b/src/ui/gui/correlation-dialog.c
index 19bb7a7001e0ca31541251ea37f8b1a5dab67990..afc23447a7af3636e58b1b69b28f3864951e5b48 100644
(file)
--- a/
src/ui/gui/correlation-dialog.c
+++ b/
src/ui/gui/correlation-dialog.c
@@
-74,7
+74,7
@@
dialog_state_valid (gpointer data)
GtkTreeModel *liststore =
gtk_tree_view_get_model (GTK_TREE_VIEW (corr->variables));
GtkTreeModel *liststore =
gtk_tree_view_get_model (GTK_TREE_VIEW (corr->variables));
- if (gtk_tree_model_iter_n_children (liststore, NULL) >
=
1)
+ if (gtk_tree_model_iter_n_children (liststore, NULL) > 1)
return TRUE;
return FALSE;
return TRUE;
return FALSE;
@@
-83,13
+83,12
@@
dialog_state_valid (gpointer data)
/* Pops up the Correlation dialog box */
void
/* Pops up the Correlation dialog box */
void
-correlation_dialog (
GObject *o, gpointer data
)
+correlation_dialog (
PsppireDataWindow *de
)
{
struct correlation rd;
gint response;
GtkBuilder *xml = builder_new ("correlation.ui");
{
struct correlation rd;
gint response;
GtkBuilder *xml = builder_new ("correlation.ui");
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "correlation-dialog");
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "correlation-dialog");
@@
-100,7
+99,10
@@
correlation_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
g_object_get (vs, "dictionary", &rd.dict, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
g_object_get (vs, "dictionary", &rd.dict, NULL);
- g_object_set (source, "model", rd.dict, NULL);
+ g_object_set (source,
+ "model", rd.dict,
+ "predicate", var_is_numeric,
+ NULL);
rd.variables = get_widget_assert (xml, "psppire-var-view1");
rd.significant = get_widget_assert (xml, "button-flag-significants");
rd.variables = get_widget_assert (xml, "psppire-var-view1");
rd.significant = get_widget_assert (xml, "button-flag-significants");
@@
-128,7
+130,7
@@
correlation_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
- paste_syntax_
in_new
_window (syntax);
+ paste_syntax_
to
_window (syntax);
g_free (syntax);
}
g_free (syntax);
}