static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionTt1s *d = PSPPIRE_DIALOG_ACTION_TT1S (act);
gchar *text;
text = gtk_entry_get_text (GTK_ENTRY (tt_d->test_value_entry));
- if ( 0 == strcmp ("", text))
+ if (0 == strcmp ("", text))
return FALSE;
/* Check to see if the entry is numeric */
return FALSE;
- if ( 0 == gtk_tree_model_get_iter_first (vars, ¬used))
+ if (0 == gtk_tree_model_get_iter_first (vars, ¬used))
return FALSE;
return TRUE;
gtk_list_store_clear (GTK_LIST_STORE (model));
}
-static void
-psppire_dialog_action_tt1s_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_tt1s_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionTt1s *act = PSPPIRE_DIALOG_ACTION_TT1S (a);
pda->dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
pda->source = get_widget_assert (xml, "one-sample-t-test-treeview2");
- g_object_set (pda->source,
+ g_object_set (pda->source,
"predicate", var_is_numeric, NULL);
act->vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
g_signal_connect_swapped (options_button, "clicked",
G_CALLBACK (tt_options_dialog_run), act->opt);
-
-
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_tt1s_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_tt1s_parent_class)->activate (pda);
+ return xml;
}
static void
static void
psppire_dialog_action_tt1s_class_init (PsppireDialogActionTt1sClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_tt1s_activate;
object_class->finalize = psppire_dialog_action_tt1s_finalize;
- action_class->activate = psppire_dialog_action_tt1s_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}