X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-tt1s.c;h=d1a4d8e10cd3d60555a3991e3797e14b554d247d;hb=5539849055ad928f536d192561cbbaab3b926180;hp=70dbfabd310c2676d7e7ab17c38a55d08b3e0681;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-tt1s.c b/src/ui/gui/psppire-dialog-action-tt1s.c index 70dbfabd31..d1a4d8e10c 100644 --- a/src/ui/gui/psppire-dialog-action-tt1s.c +++ b/src/ui/gui/psppire-dialog-action-tt1s.c @@ -32,7 +32,7 @@ G_DEFINE_TYPE (PsppireDialogActionTt1s, psppire_dialog_action_tt1s, PSPPIRE_TYPE static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionTt1s *d = PSPPIRE_DIALOG_ACTION_TT1S (act); gchar *text; @@ -103,12 +103,19 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_tt1s_activate (GtkAction *a) +psppire_dialog_action_tt1s_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionTt1s *act = PSPPIRE_DIALOG_ACTION_TT1S (a); - GtkBuilder *xml = builder_new ("t-test.ui"); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("t-test.ui"); + g_hash_table_insert (thing, a, xml); + } + GtkWidget *options_button = get_widget_assert (xml, "button1"); pda->dialog = get_widget_assert (xml, "t-test-one-sample-dialog"); @@ -128,9 +135,6 @@ psppire_dialog_action_tt1s_activate (GtkAction *a) g_signal_connect_swapped (options_button, "clicked", G_CALLBACK (tt_options_dialog_run), act->opt); - - g_object_unref (xml); - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_tt1s_parent_class)->activate) PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_tt1s_parent_class)->activate (pda); } @@ -145,11 +149,10 @@ psppire_dialog_action_tt1s_finalize (GObject *a) static void psppire_dialog_action_tt1s_class_init (PsppireDialogActionTt1sClass *class) { - GtkActionClass *action_class = GTK_ACTION_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); + psppire_dialog_action_set_activation (class, psppire_dialog_action_tt1s_activate); object_class->finalize = psppire_dialog_action_tt1s_finalize; - action_class->activate = psppire_dialog_action_tt1s_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }