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
/
descriptives-dialog.c
diff --git
a/src/ui/gui/descriptives-dialog.c
b/src/ui/gui/descriptives-dialog.c
index aaed7eee2c8b2dd7fd04e265b183e5521eae3f38..a867fe016d05131f0ff759e3536118c5ae60c855 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-dialog.c
@@
-29,7
+29,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include
<ui/gui/helper.h>
+#include
"executor.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-206,7
+206,7
@@
descriptives_dialog (GObject *o, gpointer data)
struct descriptives_dialog scd;
struct descriptives_dialog scd;
- G
ladeXML *xml = XML_NEW ("descriptives-dialog.glade
");
+ G
tkBuilder *xml = builder_new ("descriptives-dialog.ui
");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
@@
-223,12
+223,12
@@
descriptives_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 (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, var_is_numeric);
+ g_object_set (source, "dictionary", vs->dict,
+ "predicate", var_is_numeric, NULL);
set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
dest,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
dest,