X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-correlation.c;h=676f13e6aaed6a29638d89bf3a5c6516b9144fe7;hb=06033ee856ec75ed98dc7f4b5bf2c61876650fdf;hp=29f6e20179c03cb148ffce4df909cb13d076f1b6;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c index 29f6e20179..676f13e6aa 100644 --- a/src/ui/gui/psppire-dialog-action-correlation.c +++ b/src/ui/gui/psppire-dialog-action-correlation.c @@ -30,7 +30,7 @@ static void psppire_dialog_action_correlation_class_init (PsppireDialogActi G_DEFINE_TYPE (PsppireDialogActionCorrelation, psppire_dialog_action_correlation, PSPPIRE_TYPE_DIALOG_ACTION); static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionCorrelation *rd = PSPPIRE_DIALOG_ACTION_CORRELATION (act); gchar *text; @@ -92,14 +92,21 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_correlation_activate (GtkAction *a) +psppire_dialog_action_correlation_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a); - GtkBuilder *xml = builder_new ("correlation.ui"); - pda->dialog = get_widget_assert (xml, "correlation-dialog"); - pda->source = get_widget_assert (xml, "dict-view"); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("correlation.ui"); + g_hash_table_insert (thing, a, xml); + } + + pda->dialog = get_widget_assert (xml, "correlation-dialog"); + pda->source = get_widget_assert (xml, "dict-view"); act->variables = get_widget_assert (xml, "psppire-var-view1"); act->significant = get_widget_assert (xml, "button-flag-significants"); @@ -108,10 +115,6 @@ psppire_dialog_action_correlation_activate (GtkAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); psppire_dialog_action_set_refresh (pda, refresh); - g_object_unref (xml); - - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate (pda); } static void