X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-recode-same.c;h=af10448b1bfc5a60597129ed843219fee8089d3f;hb=ad4f9604cc877272fe504234e8b9078a7ce76e17;hp=d55745fbf993a7d64b6fe213251e56c07eda54a4;hpb=258cbd9cdf386687122b0854274923acafc786d4;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-recode-same.c b/src/ui/gui/psppire-dialog-action-recode-same.c index d55745fbf9..af10448b1b 100644 --- a/src/ui/gui/psppire-dialog-action-recode-same.c +++ b/src/ui/gui/psppire-dialog-action-recode-same.c @@ -58,7 +58,7 @@ dialog_state_valid (gpointer data) { PsppireDialogActionRecode *rd = data; GtkTreeIter not_used; - + if ( ! rd->value_map ) return FALSE; @@ -96,17 +96,17 @@ on_old_new_show (PsppireDialogActionRecode *rd) gtk_widget_hide (rd->strings_box); } -static void -psppire_dialog_action_recode_same_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_recode_same_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - psppire_dialog_action_recode_pre_activate (act, NULL); + GtkBuilder *xml = psppire_dialog_action_recode_pre_activate (act, NULL); gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Recode into Same Variables")); - + g_signal_connect_swapped (act->old_and_new_dialog, "show", G_CALLBACK (on_old_new_show), act); @@ -114,11 +114,13 @@ psppire_dialog_action_recode_same_activate (PsppireDialogAction *a) _("Recode into Same Variables: Old and New Values")); gtk_widget_hide (act->output_variable_box); - + psppire_dialog_action_set_refresh (pda, refresh); psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); + + return xml; } static void @@ -142,7 +144,7 @@ target_is_string (const PsppireDialogActionRecode *rd) static void psppire_dialog_action_recode_same_class_init (PsppireDialogActionRecodeSameClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_recode_same_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_recode_same_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = same_generate_syntax; PSPPIRE_DIALOG_ACTION_RECODE_CLASS (class)->target_is_string = target_is_string;