/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011, 2012 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 <gtk/gtk.h>
#include "compute-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
#include "psppire-dialog.h"
#include "psppire-keypad.h"
#include "psppire-data-window.h"
-#include "psppire-var-store.h"
#include "psppire-selector.h"
#include "dialog-common.h"
#include <libpspp/i18n.h>
+
#include <language/expressions/public.h>
-#include <language/syntax-string-source.h>
#include "executor.h"
+#include "helper.h"
+
static void function_list_populate (GtkTreeView *tv);
{
gint response;
- PsppireVarStore *vs = NULL;
struct compute_dialog scd;
GtkBuilder *xml = builder_new ("compute.ui");
get_widget_assert (xml, "radio-button-expression-label");
- g_object_get (de->data_editor, "var-store", &vs, NULL);
- g_object_get (vs, "dictionary", &scd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &scd.dict, NULL);
scd.use_type = FALSE;
g_signal_connect (expression, "toggled",
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
-
- paste_syntax_to_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;
}
gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore));
+ g_object_unref (liststore);
}