projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recent the dependency on spread-sheet-widget
[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 6610f595563a561c077506d6a0c2beb3b503055e..5b5a72f54a32f1a2dad2a90499e38b04d07ea760 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-means.c
+++ b/
src/ui/gui/psppire-dialog-action-means.c
@@
-36,7
+36,7
@@
G_DEFINE_TYPE (PsppireDialogActionMeans, psppire_dialog_action_means, PSPPIRE_TY
static char *
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
gint l;
PsppireDialogActionMeans *scd = PSPPIRE_DIALOG_ACTION_MEANS (act);
{
gint l;
PsppireDialogActionMeans *scd = PSPPIRE_DIALOG_ACTION_MEANS (act);
@@
-91,26
+91,20
@@
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 (
GtkAction *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_pointer (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, "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");
pda->dialog = get_widget_assert (xml, "means-dialog");
pda->source = get_widget_assert (xml, "all-variables");
@@
-126,14
+120,13
@@
psppire_dialog_action_means_activate (GtkAction *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);
-
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
+ 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;
}