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 c7aaf52b4cc6e7ce514dd7464dbdb077a2d97eb1..5d4cc4b431038ad00ab77e550214b605c308e9d1 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, 2011 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>
@@
-46,14
+46,6
@@
struct chisquare_dialog
GtkListStore *expected_list;
};
GtkListStore *expected_list;
};
-static void
-set_sensitivity (GtkToggleButton *button, GtkWidget *w)
-{
- gboolean state = gtk_toggle_button_get_active (button);
- gtk_widget_set_sensitive (w, state);
-}
-
-
static gboolean
dialog_state_valid (gpointer data)
{
static gboolean
dialog_state_valid (gpointer data)
{
@@
-162,7
+154,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,26
+180,24
@@
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,
NULL);
g_object_set (dict_view,
"model", csd.dict,
"predicate", var_is_numeric,
NULL);
- g_signal_connect (csd.range_button, "toggled", G_CALLBACK (set_sensitivity),
+ g_signal_connect (csd.range_button, "toggled", G_CALLBACK (set_sensitivity
_from_toggle
),
range_table);
range_table);
- g_signal_connect (csd.values_button, "toggled", G_CALLBACK (set_sensitivity),
+ g_signal_connect (csd.values_button, "toggled", G_CALLBACK (set_sensitivity
_from_toggle
),
values_acr);
values_acr);
- g_signal_connect (csd.values_button, "toggled", G_CALLBACK (set_sensitivity),
+ g_signal_connect (csd.values_button, "toggled", G_CALLBACK (set_sensitivity
_from_toggle
),
expected_value_entry);
expected_value_entry);
@@
-237,5
+226,6
@@
chisquare_dialog (PsppireDataWindow *dw)
break;
}
break;
}
+ g_object_unref (csd.expected_list);
g_object_unref (xml);
}
g_object_unref (xml);
}