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

Convert Regression dialog to GtkBuilder
---

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ac303192..23deed95 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -71,7 +71,8 @@ nodist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/message-dialog.ui \
 	$(top_srcdir)/src/ui/gui/oneway.ui \
 	$(top_srcdir)/src/ui/gui/rank.ui \
-	$(top_srcdir)/src/ui/gui/recode.ui
+	$(top_srcdir)/src/ui/gui/recode.ui \
+	$(top_srcdir)/src/ui/gui/regression.ui
 
 EXTRA_DIST += \
 	$(top_srcdir)/src/ui/gui/crosstabs.glade \
@@ -80,14 +81,14 @@ EXTRA_DIST += \
 	$(top_srcdir)/src/ui/gui/message-dialog.glade \
 	$(top_srcdir)/src/ui/gui/oneway.glade \
 	$(top_srcdir)/src/ui/gui/rank.glade \
-	$(top_srcdir)/src/ui/gui/recode.glade
+	$(top_srcdir)/src/ui/gui/recode.glade \
+	$(top_srcdir)/src/ui/gui/regression.glade
 
 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/output-viewer.glade \
 	$(top_srcdir)/src/ui/gui/psppire.glade \
-	$(top_srcdir)/src/ui/gui/regression.glade \
 	$(top_srcdir)/src/ui/gui/syntax-editor.glade \
 	$(top_srcdir)/src/ui/gui/text-data-import.glade \
 	$(top_srcdir)/src/ui/gui/t-test.glade \
diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index 4ee11fe9..3e0e0fbc 100644
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -227,7 +227,7 @@ regression_dialog (GObject *o, gpointer data)
 
   struct regression_dialog rd;
 
-  GladeXML *xml = XML_NEW ("regression.glade");
+  GtkBuilder *xml = builder_new ("regression.ui");
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "regression-dialog");