static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
gint l;
PsppireDialogActionMeans *scd = PSPPIRE_DIALOG_ACTION_MEANS (act);
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);
- GtkBuilder *xml = builder_new ("means.ui");
+ 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);
+
+ 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,
"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);
-
- g_object_unref (xml);
+ return xml;
}
static void
psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
{
- GTK_ACTION_CLASS (class)->activate = 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;
}