Convert Regression dialog to GtkBuilder

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ac3031929d6ec256e6ea8c63c86c2c5c3d92ea2b..23deed95e89808c2fbdc8a38bad9bd96dfa199f8 100644 (file)
--- 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 4ee11fe9982ffd9a55ea4e1091aa7d9db081f795..3e0e0fbc1d226d5815a57b6ea1d6845757661020 100644 (file)
--- 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");