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
/
crosstabs-dialog.c
diff --git
a/src/ui/gui/crosstabs-dialog.c
b/src/ui/gui/crosstabs-dialog.c
index 9654a27ccf90364a368cd89937999e9f8c39167b..f5593586778cd3b3bf17bcdb6376564f44d08085 100644
(file)
--- a/
src/ui/gui/crosstabs-dialog.c
+++ b/
src/ui/gui/crosstabs-dialog.c
@@
-26,7
+26,7
@@
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
-#include
<ui/gui/helper.h>
+#include
"executor.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>
@@
-387,8
+387,7
@@
crosstabs_dialog (GObject *o, gpointer data)
gint response;
struct crosstabs_dialog cd;
gint response;
struct crosstabs_dialog cd;
- GladeXML *xml = XML_NEW ("crosstabs.glade");
-
+ GtkBuilder *xml = builder_new ("crosstabs.ui");
PsppireVarStore *vs = NULL;
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs = NULL;
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
@@
-423,9
+422,7
@@
crosstabs_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, NULL);
+ g_object_set (source, "dictionary", vs->dict, NULL);
set_dest_model (GTK_TREE_VIEW (dest_rows), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest_cols), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest_rows), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest_cols), vs->dict);