projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
chi-square-dialog.c
diff --git
a/src/ui/gui/chi-square-dialog.c
b/src/ui/gui/chi-square-dialog.c
index ccfa48ec33138dc42aed6bb29fc7e4150c653c11..64a6356ce188f3d0356c3d6051102ddbe083f942 100644
(file)
--- a/
src/ui/gui/chi-square-dialog.c
+++ b/
src/ui/gui/chi-square-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2010 Free Software Foundation
+ Copyright (C) 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
@@
-23,9
+23,9
@@
#include "psppire-acr.h"
#include "dialog-common.h"
#include "psppire-acr.h"
#include "dialog-common.h"
-#include "
hel
per.h"
+#include "
builder-wrap
per.h"
#include "executor.h"
#include "executor.h"
-
+#include "helper.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-162,7
+162,6
@@
chisquare_dialog (PsppireDataWindow *dw)
struct chisquare_dialog csd;
GtkBuilder *xml = builder_new ("chi-square.ui");
struct chisquare_dialog csd;
GtkBuilder *xml = builder_new ("chi-square.ui");
- PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "chisquare-dialog");
GtkWidget *dialog = get_widget_assert (xml, "chisquare-dialog");
@@
-189,12
+188,10
@@
chisquare_dialog (PsppireDataWindow *dw)
csd.values_button = get_widget_assert (xml, "radiobutton2");
csd.values_button = get_widget_assert (xml, "radiobutton2");
- g_object_get (dw->data_editor, "var-store", &vs, NULL);
-
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (dw));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (dw));
- g_object_get (
vs
, "dictionary", &csd.dict, NULL);
+ g_object_get (
dw->data_editor
, "dictionary", &csd.dict, NULL);
g_object_set (dict_view,
"model", csd.dict,
"predicate", var_is_numeric,
g_object_set (dict_view,
"model", csd.dict,
"predicate", var_is_numeric,
@@
-228,7
+225,7
@@
chisquare_dialog (PsppireDataWindow *dw)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- g_free (execute_syntax_string (generate_syntax (&csd)));
+ g_free (execute_syntax_string (
dw,
generate_syntax (&csd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&csd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&csd)));
@@
-237,5
+234,6
@@
chisquare_dialog (PsppireDataWindow *dw)
break;
}
break;
}
+ g_object_unref (csd.expected_list);
g_object_unref (xml);
}
g_object_unref (xml);
}