#include <config.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <language/syntax-string-source.h>
-#include <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-data-window.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
-#include "syntax-editor.h"
-
#include "helper.h"
#include "psppire-var-ptr.h"
{
struct tt_paired_samples_dialog tt_d;
gint response;
- struct data_editor *de = data;
-
- PsppireVarStore *vs;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
- GladeXML *xml = XML_NEW ("t-test.glade");
+ PsppireVarStore *vs = NULL;
- 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, "paired-samples-t-test-treeview1");
- GtkWidget *options_button = get_widget_assert (xml, "options-button");
+ GtkWidget *options_button = get_widget_assert (xml, "paired-samples-t-test-options-button");
GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
GtkWidget *dialog = get_widget_assert (xml, "t-test-paired-samples-dialog");
- vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
tt_d.dict = vs->dict;
tt_d.pairs_treeview =
get_widget_assert (xml, "paired-samples-t-test-treeview2");
- tt_d.opt = tt_options_dialog_create (xml, de->parent.window);
+ tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}