projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireSelector: new properties: "source-widget" and "dest-widget".
[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 58b68b2ff2f652d387f34d1d7394e33e20f8437f..1e14dfa17767f196007057f7b18505e10bf81b75 100644
(file)
--- a/
src/ui/gui/t-test-paired-samples.c
+++ b/
src/ui/gui/t-test-paired-samples.c
@@
-17,20
+17,21
@@
#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 "executor.h"
+
#include "helper.h"
#include "psppire-var-ptr.h"
#include "helper.h"
#include "psppire-var-ptr.h"
@@
-185,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");
@@
-198,7
+199,7
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
-
tt_d.dict = vs->dict
;
+
g_object_get (vs, "dictionary", &tt_d.dict, NULL)
;
tt_d.pairs_treeview =
get_widget_assert (xml, "paired-samples-t-test-treeview2");
tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
tt_d.pairs_treeview =
get_widget_assert (xml, "paired-samples-t-test-treeview2");
tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
@@
-206,10
+207,9
@@
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),
- vs->dict,
- GTK_SELECTION_MULTIPLE,
- var_is_numeric);
+ g_object_set (dict_view, "dictionary", tt_d.dict,
+ "predicate",
+ var_is_numeric, NULL);
{
tt_d.list_store =
{
tt_d.list_store =
@@
-229,8
+229,6
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- dict_view,
- tt_d.pairs_treeview,
select_as_pair_member,
NULL,
&tt_d);
select_as_pair_member,
NULL,
&tt_d);