G_DEFINE_TYPE (PsppireDialogActionUnivariate, psppire_dialog_action_univariate, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionUnivariate *uvd = PSPPIRE_DIALOG_ACTION_UNIVARIATE (act);
GString *str = g_string_new ("GLM ");
g_string_append (str, gtk_entry_get_text (GTK_ENTRY (uvd->dep_entry)));
-
+
g_string_append (str, " BY ");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (uvd->factor_list), 0, str);
GtkTreeModel *vars;
GtkTreeIter notused;
- if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ud->dep_entry))))
+ if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ud->dep_entry))))
return false;
vars =
gtk_list_store_clear (GTK_LIST_STORE (liststore));
}
-static void
-psppire_dialog_action_univariate_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_univariate_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionUnivariate *act = PSPPIRE_DIALOG_ACTION_UNIVARIATE (a);
GtkBuilder *xml = builder_new ("univariate.ui");
+
pda->dialog = get_widget_assert (xml, "univariate-dialog");
pda->source = get_widget_assert (xml, "dict-view");
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
-
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_univariate_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_univariate_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_univariate_class_init (PsppireDialogActionUnivariateClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_univariate_activate;
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_univariate_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}