/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009 Free Software Foundation
+ Copyright (C) 2009, 2010 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
#include <config.h>
#include "dialog-common.h"
-#include <language/syntax-string-source.h>
#include <ui/syntax-gen.h>
#include <libpspp/str.h>
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;
/* 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");
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "correlation-dialog");
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");
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 (generate_syntax (&rd)));
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;