projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed most uses of GladeXML from data window
[pspp]
/
src
/
ui
/
gui
/
t-test-independent-samples-dialog.c
diff --git
a/src/ui/gui/t-test-independent-samples-dialog.c
b/src/ui/gui/t-test-independent-samples-dialog.c
index 22b4526c4d7027a2dccb8a235992d33fa1378427..392867adbb606acd5c62abad6ce6a58286807f13 100644
(file)
--- a/
src/ui/gui/t-test-independent-samples-dialog.c
+++ b/
src/ui/gui/t-test-independent-samples-dialog.c
@@
-22,7
+22,7
@@
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
-#include "
data-editor
.h"
+#include "
psppire-data-window
.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
@@
-31,7
+31,7
@@
#include <ui/syntax-gen.h>
#include <language/syntax-string-source.h>
#include <ui/syntax-gen.h>
#include <language/syntax-string-source.h>
-#include "
syntax-edito
r.h"
+#include "
helpe
r.h"
#include <gl/xalloc.h>
#include <gl/xalloc.h>
@@
-391,7
+391,7
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
{
struct tt_indep_samples_dialog tt_d;
gint response;
{
struct tt_indep_samples_dialog tt_d;
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
PsppireVarStore *vs = NULL;
PsppireVarStore *vs = NULL;
@@
-420,11
+420,11
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
tt_d.define_groups_button = get_widget_assert (xml, "define-groups-button");
tt_d.groups_entry = get_widget_assert (xml, "indep-samples-t-test-entry");
tt_d.define_groups_button = get_widget_assert (xml, "define-groups-button");
tt_d.groups_entry = get_widget_assert (xml, "indep-samples-t-test-entry");
- tt_d.opts = tt_options_dialog_create (xml,
de->parent.window
);
- tt_d.grps = tt_groups_dialog_create (xml,
de->parent.window
);
+ tt_d.opts = tt_options_dialog_create (xml,
GTK_WINDOW (de)
);
+ tt_d.grps = tt_groups_dialog_create (xml,
GTK_WINDOW (de)
);
- gtk_window_set_transient_for (GTK_WINDOW (tt_d.dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (tt_d.dialog),
GTK_WINDOW (de)
);
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
vs->dict,
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
vs->dict,
@@
-474,6
+474,7
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-483,12
+484,7
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
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);
}
break;
g_free (syntax);
}
break;