projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filter file choosers by mimetype instead of file name
[pspp-builds.git]
/
src
/
ui
/
gui
/
correlation-dialog.c
diff --git
a/src/ui/gui/correlation-dialog.c
b/src/ui/gui/correlation-dialog.c
index 19bb7a7001e0ca31541251ea37f8b1a5dab67990..2e715039a9979783ea44426dcfe62b0dddc59d7e 100644
(file)
--- a/
src/ui/gui/correlation-dialog.c
+++ b/
src/ui/gui/correlation-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009 Free Software Foundation
+ Copyright (C) 2009
, 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
@@
-17,7
+17,6
@@
#include <config.h>
#include "dialog-common.h"
#include <config.h>
#include "dialog-common.h"
-#include <language/syntax-string-source.h>
#include <ui/syntax-gen.h>
#include <libpspp/str.h>
#include <ui/syntax-gen.h>
#include <libpspp/str.h>
@@
-74,7
+73,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
+82,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
+98,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");
@@
-116,22
+117,10
@@
correlation_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&rd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&rd)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&rd);
- paste_syntax_in_new_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&rd)));
break;
default:
break;
break;
default:
break;