projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-var-store: Remove.
[pspp]
/
src
/
ui
/
gui
/
compute-dialog.c
diff --git
a/src/ui/gui/compute-dialog.c
b/src/ui/gui/compute-dialog.c
index 8a98bb3dcac48d8158812d5f9b96bb7c4df6b687..9ddb66d48e4fcc848cbf48eb4b95eaf2754d7114 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-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, 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
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,18
+17,19
@@
#include <config.h>
#include <gtk/gtk.h>
#include "compute-dialog.h"
#include <config.h>
#include <gtk/gtk.h>
#include "compute-dialog.h"
-#include "
hel
per.h"
+#include "
builder-wrap
per.h"
#include "psppire-dialog.h"
#include "psppire-keypad.h"
#include "psppire-data-window.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 "psppire-selector.h"
#include "dialog-common.h"
#include <libpspp/i18n.h>
+
#include <language/expressions/public.h>
#include <language/expressions/public.h>
-#include <language/syntax-string-source.h>
#include "executor.h"
#include "executor.h"
+#include "helper.h"
+
static void function_list_populate (GtkTreeView *tv);
static void function_list_populate (GtkTreeView *tv);
@@
-363,15
+364,13
@@
contents_plausible (gpointer data)
/* Pops up the Compute dialog box */
void
/* Pops up the Compute dialog box */
void
-compute_dialog (
GObject *o, gpointer data
)
+compute_dialog (
PsppireDataWindow *de
)
{
gint response;
{
gint response;
- PsppireDataWindow *de = data;
- PsppireVarStore *vs = NULL;
struct compute_dialog scd;
struct compute_dialog scd;
- GtkBuilder *xml = builder_new ("
psppir
e.ui");
+ GtkBuilder *xml = builder_new ("
comput
e.ui");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");
@@
-387,8
+386,7
@@
compute_dialog (GObject *o, gpointer data)
get_widget_assert (xml, "radio-button-expression-label");
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",
scd.use_type = FALSE;
g_signal_connect (expression, "toggled",
@@
-436,23
+434,10
@@
compute_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
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:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
-
- paste_syntax_in_new_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;
break;
default:
break;
@@
-514,6
+499,7
@@
function_list_populate (GtkTreeView *tv)
}
gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore));
}
gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore));
+ g_object_unref (liststore);
}
}