#include <config.h>
-#include <glade/glade.h>
#include <gtk/gtk.h>
#include "t-test-independent-samples-dialog.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
-#include <gtksheet/gtksheet.h>
#include "data-editor.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
#include "t-test-options.h"
-#include <libpspp/syntax-gen.h>
+#include <ui/syntax-gen.h>
#include <language/syntax-string-source.h>
#include "syntax-editor.h"
}
static struct tt_groups_dialog *
-tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent)
+tt_groups_dialog_create (GtkBuilder *xml, GtkWindow *parent)
{
struct tt_groups_dialog *grps = xmalloc (sizeof (*grps));
g_signal_connect (grps->values_toggle_button, "toggled",
G_CALLBACK (set_group_criterion_type), grps);
- gtk_window_set_transient_for (parent,
- GTK_WINDOW (grps->dialog));
-
-
+ gtk_window_set_transient_for (GTK_WINDOW (grps->dialog), parent);
grps->val[0] = strdup ("");
grps->val[1] = strdup ("");
struct tt_indep_samples_dialog
{
- GladeXML *xml; /* The xml that generated the widgets */
+ GtkBuilder *xml; /* The xml that generated the widgets */
GtkWidget *dialog;
PsppireDict *dict;
GtkWidget *define_groups_button;
GString *str = g_string_new ("T-TEST /VARIABLES=");
- append_variable_names (str, d->dict, GTK_TREE_VIEW (tv));
+ append_variable_names (str, d->dict, GTK_TREE_VIEW (tv), 0);
g_string_append (str, "\n\t/GROUPS=");
if ( var_is_alpha (group_variable))
{
- struct string s;
- ds_init_cstr (&s, d->grps->val[0]);
- gen_quoted_string (&s);
+ struct string s = DS_EMPTY_INITIALIZER;
+ syntax_gen_string (&s, ss_cstr (d->grps->val[0]));
g_string_append (str, ds_cstr (&s));
ds_destroy (&s);
}
if ( var_is_alpha (group_variable))
{
- struct string s;
- ds_init_cstr (&s, d->grps->val[1]);
- gen_quoted_string (&s);
+ struct string s = DS_EMPTY_INITIALIZER;
+ syntax_gen_string (&s, ss_cstr (d->grps->val[1]));
g_string_append (str, ds_cstr (&s));
ds_destroy (&s);
}
gint response;
struct data_editor *de = data;
- PsppireVarStore *vs;
+ PsppireVarStore *vs = NULL;
- GladeXML *xml = XML_NEW ("t-test.glade");
-
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ GtkBuilder *xml = builder_new ("t-test.ui");
GtkWidget *dict_view =
get_widget_assert (xml, "indep-samples-t-test-treeview1");
get_widget_assert (xml, "indep-samples-t-test-selector1");
GtkWidget *options_button =
- get_widget_assert (xml, "options-button");
+ get_widget_assert (xml, "indep-samples-t-test-options-button");
- vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
tt_d.dialog = get_widget_assert (xml, "t-test-independent-samples-dialog");
tt_d.xml = xml;
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
dict_view, test_variables_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
dict_view, tt_d.groups_entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
g_signal_connect_swapped (tt_d.define_groups_button, "clicked",
G_CALLBACK (run_define_groups), &tt_d);