projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Means Dialog: Replace deprecated widgets
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-means.c
diff --git
a/src/ui/gui/psppire-dialog-action-means.c
b/src/ui/gui/psppire-dialog-action-means.c
index 807d3fc38b9c6c9709c04884b4e279eebbfa0527..090a9eb13a4e1eeaca279def937b1fabb5e24718 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-means.c
+++ b/
src/ui/gui/psppire-dialog-action-means.c
@@
-97,18
+97,24
@@
psppire_dialog_action_means_activate (GtkAction *a)
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a);
- GtkBuilder *xml = builder_new ("means.ui");
+ GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("means.ui");
+ g_hash_table_insert (thing, a, xml);
- GtkWidget *vb = get_widget_assert (xml, "alignment3");
- GtkWidget *selector = get_widget_assert (xml, "layer-selector");
+ GtkWidget *vb = get_widget_assert (xml, "frame2");
+ act->layer = psppire_means_layer_new ();
+ gtk_container_add (GTK_CONTAINER (vb), act->layer);
+ gtk_widget_show (act->layer);
+ }
- act->layer = psppire_means_layer_new ();
- gtk_container_add (GTK_CONTAINER (vb), act->layer);
- gtk_widget_show (act->layer);
+ GtkWidget *selector = get_widget_assert (xml, "layer-selector");
- pda->dialog = get_widget_assert
(xml, "means-dialog");
- pda->source = get_widget_assert
(xml, "all-variables");
- act->variables = get_widget_assert
(xml, "stat-variables");
+ pda->dialog = get_widget_assert (xml, "means-dialog");
+ pda->source = get_widget_assert (xml, "all-variables");
+ act->variables = get_widget_assert (xml, "stat-variables");
g_object_set (pda->source,
"predicate", var_is_numeric,
g_object_set (pda->source,
"predicate", var_is_numeric,
@@
-118,19
+124,16
@@
psppire_dialog_action_means_activate (GtkAction *a)
"dest-widget", act->layer,
NULL);
"dest-widget", act->layer,
NULL);
-
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
-
- g_object_unref (xml);
}
static void
psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
{
}
static void
psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
{
-
GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_means_activate
;
+
psppire_dialog_action_set_activation (class, psppire_dialog_action_means_activate)
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}