Convert Crosstabs dialog to GtkBuilder

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index b8bc11522167351ae7e84d63d853e8cb5ca6844b..621a44c36f4cd21ba8462d2989cc420909a637b1 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -65,6 +65,7 @@ src_ui_gui_psppire_LDADD = \
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 nodist_src_ui_gui_psppire_DATA = \
+       $(top_srcdir)/src/ui/gui/crosstabs.ui \
        $(top_srcdir)/src/ui/gui/examine.ui \
        $(top_srcdir)/src/ui/gui/frequencies.ui \
        $(top_srcdir)/src/ui/gui/oneway.ui \
@@ -72,6 +73,7 @@ nodist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/recode.ui
 
 EXTRA_DIST += \
+       $(top_srcdir)/src/ui/gui/crosstabs.glade \
        $(top_srcdir)/src/ui/gui/examine.glade \
        $(top_srcdir)/src/ui/gui/frequencies.glade \
        $(top_srcdir)/src/ui/gui/oneway.glade \
@@ -81,7 +83,6 @@ EXTRA_DIST += \
 dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/data-editor.glade \
        $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \
-       $(top_srcdir)/src/ui/gui/crosstabs.glade \
        $(top_srcdir)/src/ui/gui/message-dialog.glade \
        $(top_srcdir)/src/ui/gui/output-viewer.glade \
        $(top_srcdir)/src/ui/gui/psppire.glade \

diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c
index edaa3e42a1f1a5c0185006feef0dfb8199f168f2..2c50b461844d38de4587e1bcc9fcad01212b4d04 100644 (file)
--- a/src/ui/gui/crosstabs-dialog.c
+++ b/src/ui/gui/crosstabs-dialog.c
@@ -26,7 +26,7 @@
 #include <ui/gui/data-editor.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
-#include <ui/gui/helper.h>
+#include "helper.h"
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
 #include <ui/gui/syntax-editor.h>
@@ -389,7 +389,7 @@ crosstabs_dialog (GObject *o, gpointer data)
 
   struct crosstabs_dialog cd;
 
-  GladeXML *xml = XML_NEW ("crosstabs.glade");
+  GtkBuilder *xml = builder_new ("crosstabs.ui");
   PsppireVarStore *vs = NULL;
 
   GtkWidget *dialog = get_widget_assert   (xml, "crosstabs-dialog");