X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-paired.c;h=a5ce1584a4daad9d7c9f2391cd92e9ac13d2edb0;hb=fc6620099bbc53762095569d5356b67a81a85402;hp=fbd09b97c4f5e0806c01a2d613f33d6c8090cfb5;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-paired.c b/src/ui/gui/psppire-dialog-action-paired.c index fbd09b97c4..a5ce1584a4 100644 --- a/src/ui/gui/psppire-dialog-action-paired.c +++ b/src/ui/gui/psppire-dialog-action-paired.c @@ -155,9 +155,16 @@ psppire_dialog_action_paired_activate (GtkAction *a) PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a); - GtkBuilder *xml = builder_new ("paired-samples.ui"); + GHashTable *thing = psppire_dialog_action_get_pointer (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("paired-samples.ui"); + g_hash_table_insert (thing, a, xml); + } + GtkWidget *selector = get_widget_assert (xml, "psppire-selector3"); - GtkWidget *bb = gtk_hbutton_box_new (); + GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); GtkWidget *button = gtk_button_new_with_mnemonic (_("O_ptions...")); GtkWidget *box = get_widget_assert (xml, "vbox3"); @@ -192,8 +199,6 @@ psppire_dialog_action_paired_activate (GtkAction *a) select_as_pair_member, act); - g_object_unref (xml); - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate) PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_paired_parent_class)->activate (pda); } @@ -208,13 +213,11 @@ psppire_dialog_action_paired_finalize (GObject *o) static void psppire_dialog_action_paired_class_init (PsppireDialogActionPairedClass *class) { - GtkActionClass *action_class = GTK_ACTION_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); - - action_class->activate = psppire_dialog_action_paired_activate; + psppire_dialog_action_set_activation (class, psppire_dialog_action_paired_activate); PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; - object_class->finalize = psppire_dialog_action_paired_finalize; + object_class->finalize = psppire_dialog_action_paired_finalize; }