Convert Examine dialog to GtkBuilder

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index e504a73082bf34b7c6aaabafa96f07698490b65a..b8bc11522167351ae7e84d63d853e8cb5ca6844b 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -65,12 +65,14 @@ src_ui_gui_psppire_LDADD = \
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 nodist_src_ui_gui_psppire_DATA = \
+       $(top_srcdir)/src/ui/gui/examine.ui \
        $(top_srcdir)/src/ui/gui/frequencies.ui \
        $(top_srcdir)/src/ui/gui/oneway.ui \
        $(top_srcdir)/src/ui/gui/rank.ui \
        $(top_srcdir)/src/ui/gui/recode.ui
 
 EXTRA_DIST += \
+       $(top_srcdir)/src/ui/gui/examine.glade \
        $(top_srcdir)/src/ui/gui/frequencies.glade \
        $(top_srcdir)/src/ui/gui/oneway.glade \
        $(top_srcdir)/src/ui/gui/rank.glade \
@@ -79,7 +81,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/examine.glade \
        $(top_srcdir)/src/ui/gui/crosstabs.glade \
        $(top_srcdir)/src/ui/gui/message-dialog.glade \
        $(top_srcdir)/src/ui/gui/output-viewer.glade \

diff --git a/src/ui/gui/examine-dialog.c b/src/ui/gui/examine-dialog.c
index 6813b4b1d451ee5d5756abe05f6d34a933f7ab42..682af46bfe80bfa156bfc976879adb21180b0084 100644 (file)
--- a/src/ui/gui/examine-dialog.c
+++ b/src/ui/gui/examine-dialog.c
@@ -240,9 +240,7 @@ examine_dialog (GObject *o, gpointer data)
 
   struct examine_dialog ex_d;
 
-
-  GladeXML *xml = XML_NEW ("examine.glade");
-
+  GtkBuilder *xml = builder_new ("examine.ui");
 
   GtkWidget *dialog = get_widget_assert   (xml, "examine-dialog");
   GtkWidget *source = get_widget_assert   (xml, "treeview1");