projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
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 b84bee9bfc90dff286c345c79a3dbfea546ef7b7..dcc24fadd85c8ddc75354efdf94100190dd17c28 100644
(file)
--- a/
src/ui/gui/t-test-paired-samples.c
+++ b/
src/ui/gui/t-test-paired-samples.c
@@
-17,21
+17,20
@@
#include <config.h>
#include <gtk/gtk.h>
#include <config.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
+#include "psppire-selector.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "t-test-paired-samples.h"
#include "t-test-options.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "t-test-paired-samples.h"
#include "t-test-options.h"
-#include "dict-display.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
-#include "
psppire-syntax-window
.h"
+#include "
executor
.h"
#include "helper.h"
#include "helper.h"
@@
-187,7
+186,7
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
PsppireVarStore *vs = NULL;
PsppireVarStore *vs = NULL;
- G
ladeXML *xml = XML_NEW ("t-test.glade
");
+ G
tkBuilder *xml = builder_new ("t-test.ui
");
GtkWidget *dict_view =
get_widget_assert (xml, "paired-samples-t-test-treeview1");
GtkWidget *dict_view =
get_widget_assert (xml, "paired-samples-t-test-treeview1");
@@
-208,10
+207,10
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
-
attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view)
,
+
g_object_set (dict_view, "dictionary"
,
vs->dict,
vs->dict,
-
GTK_SELECTION_MULTIPLE
,
- var_is_numeric);
+
"predicate"
,
+ var_is_numeric
, NULL
);
{
tt_d.list_store =
{
tt_d.list_store =
@@
-255,6
+254,7
@@
t_test_paired_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);
@@
-264,12
+264,7
@@
t_test_paired_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);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}