projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move data-editor.c to psppire-data-window.c
[pspp]
/
src
/
ui
/
gui
/
t-test-paired-samples.c
diff --git
a/src/ui/gui/t-test-paired-samples.c
b/src/ui/gui/t-test-paired-samples.c
index 7bb422ca7c55d240a8e7823c5a482466ee70e4ae..b84bee9bfc90dff286c345c79a3dbfea546ef7b7 100644
(file)
--- a/
src/ui/gui/t-test-paired-samples.c
+++ b/
src/ui/gui/t-test-paired-samples.c
@@
-19,9
+19,8
@@
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <language/syntax-string-source.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 "psppire-dict.h"
#include "psppire-var-store.h"
@@
-32,7
+31,7
@@
#include "dialog-common.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
-#include "
syntax-editor
.h"
+#include "
psppire-syntax-window
.h"
#include "helper.h"
#include "helper.h"
@@
-184,15
+183,12
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
{
struct tt_paired_samples_dialog tt_d;
gint response;
{
struct tt_paired_samples_dialog tt_d;
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
- PsppireVarStore *vs;
+ PsppireVarStore *vs
= NULL
;
GladeXML *xml = XML_NEW ("t-test.glade");
GladeXML *xml = XML_NEW ("t-test.glade");
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
GtkWidget *dict_view =
get_widget_assert (xml, "paired-samples-t-test-treeview1");
GtkWidget *dict_view =
get_widget_assert (xml, "paired-samples-t-test-treeview1");
@@
-202,14
+198,14
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
GtkWidget *dialog = get_widget_assert (xml, "t-test-paired-samples-dialog");
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.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),
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
@@
-269,10
+265,11
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&tt_d);
{
gchar *syntax = generate_syntax (&tt_d);
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
+ GtkWidget *se = psppire_syntax_window_new ();
+
+ gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
- gtk_
text_buffer_insert_at_cursor (se->buffer, syntax, -1
);
+ gtk_
widget_show (se
);
g_free (syntax);
}
g_free (syntax);
}