X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-two-sample.c;h=1d8d92ca50b55f266b57fa7b99ac4fd76ea9ad76;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=ce08e05271bbc9c782aab1a3bd4bc6127cdac758;hpb=2b34727c23cb4c291f2fc8b52a29619957f2e06a;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-two-sample.c b/src/ui/gui/psppire-dialog-action-two-sample.c index ce08e05271..1d8d92ca50 100644 --- a/src/ui/gui/psppire-dialog-action-two-sample.c +++ b/src/ui/gui/psppire-dialog-action-two-sample.c @@ -68,7 +68,7 @@ dialog_state_valid (gpointer data) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (pd->nts[NT_MCNEMAR].button))) return TRUE; - + return FALSE; } @@ -134,7 +134,7 @@ select_as_pair_member (GtkTreeIter source_iter, static gchar * -generate_syntax (PsppireDialogAction *pda) +generate_syntax (const PsppireDialogAction *pda) { gint i; @@ -169,12 +169,12 @@ generate_syntax (PsppireDialogAction *pda) } static void -psppire_dialog_action_two_sample_activate (GtkAction *a) +psppire_dialog_action_two_sample_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionTwoSample *act = PSPPIRE_DIALOG_ACTION_TWO_SAMPLE (a); - GHashTable *thing = psppire_dialog_action_get_pointer (pda); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); GtkBuilder *xml = g_hash_table_lookup (thing, a); if (!xml) { @@ -228,9 +228,7 @@ psppire_dialog_action_two_sample_activate (GtkAction *a) psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), select_as_pair_member, act); - - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate (pda); + } static void