X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-rank.c;h=8b9a5bb5c9ccbb889c75768f3d9e6d4d4197b748;hb=bbebcf3f9d827d8c68aeaf90b65c88ad1b77ba8e;hp=f4d59b7be2df5ee77866b7b2af09d2c0c07c14e5;hpb=6bf4567d7fcf5f0fa5805c4de24c13c2a7cfbbc9;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-rank.c b/src/ui/gui/psppire-dialog-action-rank.c index f4d59b7be2..8b9a5bb5c9 100644 --- a/src/ui/gui/psppire-dialog-action-rank.c +++ b/src/ui/gui/psppire-dialog-action-rank.c @@ -36,7 +36,7 @@ G_DEFINE_TYPE (PsppireDialogActionRank, psppire_dialog_action_rank, PSPPIRE_TYPE static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionRank *rd = PSPPIRE_DIALOG_ACTION_RANK (act); @@ -206,14 +206,13 @@ set_sensitivity (PsppireDialogActionRank *dar) gtk_widget_set_sensitive (dar->formula_box, sens); } -static void -psppire_dialog_action_rank_activate (GtkAction *a) +static GtkBuilder * +psppire_dialog_action_rank_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionRank *act = PSPPIRE_DIALOG_ACTION_RANK (a); - GtkBuilder *xml = builder_new ("rank.ui"); - + GtkBuilder *xml = builder_new ( "rank.ui"); GtkWidget *types_button = get_widget_assert (xml, "button1"); GtkWidget *ties_button = get_widget_assert (xml, "button2"); @@ -292,15 +291,13 @@ psppire_dialog_action_rank_activate (GtkAction *a) psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid); psppire_dialog_action_set_refresh (pda, dialog_refresh); - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_rank_parent_class)->activate (pda); - - g_object_unref (xml); + return xml; } static void psppire_dialog_action_rank_class_init (PsppireDialogActionRankClass *class) { - GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_rank_activate; + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_rank_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }