From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 4 Jan 2009 05:19:07 +0000 (+0900)
Subject: Convert Crosstabs dialog to GtkBuilder
X-Git-Tag: v0.7.1~22
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2c69e2706b5e6ed05ff865ab7b3aca04817fc99;p=pspp-builds.git

Convert Crosstabs dialog to GtkBuilder
---

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index b8bc1152..621a44c3 100644
--- 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 edaa3e42..2c50b461 100644
--- 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");