projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into sheet
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-chisquare.c
diff --git
a/src/ui/gui/psppire-dialog-action-chisquare.c
b/src/ui/gui/psppire-dialog-action-chisquare.c
index 00b6d22a4f46ac89608cd17002f463f89a2c37a6..3a45e4a714b6217e14bf022e1eb2b35a61d97530 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-chisquare.c
+++ b/
src/ui/gui/psppire-dialog-action-chisquare.c
@@
-37,7
+37,7
@@
G_DEFINE_TYPE (PsppireDialogActionChisquare, psppire_dialog_action_chisquare, PS
static char *
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionChisquare *scd = PSPPIRE_DIALOG_ACTION_CHISQUARE (act);
{
PsppireDialogActionChisquare *scd = PSPPIRE_DIALOG_ACTION_CHISQUARE (act);
@@
-129,7
+129,7
@@
refresh (PsppireDialogAction *rd_)
}
static void
}
static void
-psppire_dialog_action_chisquare_activate (
Gtk
Action *a)
+psppire_dialog_action_chisquare_activate (
PsppireDialog
Action *a)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a);
@@
-184,8
+184,6
@@
psppire_dialog_action_chisquare_activate (GtkAction *a)
psppire_acr_set_model(PSPPIRE_ACR (values_acr), act->expected_list);
psppire_acr_set_model(PSPPIRE_ACR (values_acr), act->expected_list);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_chisquare_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_chisquare_parent_class)->activate (pda);
}
static void
}
static void