projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: added help in recode.ui subdialog
[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 ee45e84854e7ceee4da630a5b7054c3221e84f51..c9b7eb8f65f41fb1e83e24a387d4b126996c6f69 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-means.c
+++ b/
src/ui/gui/psppire-dialog-action-means.c
@@
-91,24
+91,18
@@
dialog_refresh (PsppireDialogAction *da)
psppire_means_layer_clear (PSPPIRE_MEANS_LAYER (pdm->layer));
}
psppire_means_layer_clear (PSPPIRE_MEANS_LAYER (pdm->layer));
}
-static
void
-psppire_dialog_action_means_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_means_activate (PsppireDialogAction *a
, GVariant *param
)
{
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);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("means.ui");
- g_hash_table_insert (thing, a, xml);
+ GtkBuilder *xml = builder_new ("means.ui");
- 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);
- }
+ 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);
GtkWidget *selector = get_widget_assert (xml, "layer-selector");
GtkWidget *selector = get_widget_assert (xml, "layer-selector");
@@
-126,13
+120,13
@@
psppire_dialog_action_means_activate (PsppireDialogAction *a)
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
-
+ return xml;
}
static void
psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
{
}
static void
psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_means_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_means_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}