projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort Dialog: Remove deprecated widgets and make some cosmetic improvements
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-univariate.c
diff --git
a/src/ui/gui/psppire-dialog-action-univariate.c
b/src/ui/gui/psppire-dialog-action-univariate.c
index 79bf5ee0d3a332a90176d30843e09d16c4078a99..664dd36e43b89218f8837e651169d58e690e1184 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-univariate.c
+++ b/
src/ui/gui/psppire-dialog-action-univariate.c
@@
-88,7
+88,14
@@
psppire_dialog_action_univariate_activate (GtkAction *a)
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionUnivariate *act = PSPPIRE_DIALOG_ACTION_UNIVARIATE (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionUnivariate *act = PSPPIRE_DIALOG_ACTION_UNIVARIATE (a);
- GtkBuilder *xml = builder_new ("univariate.ui");
+ GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("univariate.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
+
pda->dialog = get_widget_assert (xml, "univariate-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "univariate-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-98,8
+105,6
@@
psppire_dialog_action_univariate_activate (GtkAction *a)
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
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_univariate_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_univariate_parent_class)->activate (pda);
}
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_univariate_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_univariate_parent_class)->activate (pda);
}
@@
-107,9
+112,7
@@
psppire_dialog_action_univariate_activate (GtkAction *a)
static void
psppire_dialog_action_univariate_class_init (PsppireDialogActionUnivariateClass *class)
{
static void
psppire_dialog_action_univariate_class_init (PsppireDialogActionUnivariateClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_univariate_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_univariate_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}