projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bugs in frequencies dialog.
[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..aa833dd332de728617a47b0281ab11dbff68a441 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-univariate.c
+++ b/
src/ui/gui/psppire-dialog-action-univariate.c
@@
-30,7
+30,7
@@
static void psppire_dialog_action_univariate_class_init (PsppireDialogActio
G_DEFINE_TYPE (PsppireDialogActionUnivariate, psppire_dialog_action_univariate, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
G_DEFINE_TYPE (PsppireDialogActionUnivariate, psppire_dialog_action_univariate, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionUnivariate *uvd = PSPPIRE_DIALOG_ACTION_UNIVARIATE (act);
{
PsppireDialogActionUnivariate *uvd = PSPPIRE_DIALOG_ACTION_UNIVARIATE (act);
@@
-83,12
+83,19
@@
refresh (PsppireDialogAction *rd_)
}
static void
}
static void
-psppire_dialog_action_univariate_activate (
Gtk
Action *a)
+psppire_dialog_action_univariate_activate (
PsppireDialog
Action *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_hash_table (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,18
+105,12
@@
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);
}
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;
}