From e58acb6918bebe738a512a4d83402af1aa5b5b57 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 4 Jan 2009 13:59:50 +0900 Subject: [PATCH] Convert Frequencies dialog to GtkBuilder --- src/ui/gui/automake.mk | 3 ++- src/ui/gui/frequencies-dialog.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 15624497..e504a730 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -65,11 +65,13 @@ src_ui_gui_psppire_LDADD = \ src_ui_gui_psppiredir = $(pkgdatadir) nodist_src_ui_gui_psppire_DATA = \ + $(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/frequencies.glade \ $(top_srcdir)/src/ui/gui/oneway.glade \ $(top_srcdir)/src/ui/gui/rank.glade \ $(top_srcdir)/src/ui/gui/recode.glade @@ -79,7 +81,6 @@ dist_src_ui_gui_psppire_DATA = \ $(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/frequencies.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/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c index 802a4664..89cf7683 100644 --- a/src/ui/gui/frequencies-dialog.c +++ b/src/ui/gui/frequencies-dialog.c @@ -311,7 +311,7 @@ frequencies_dialog (GObject *o, gpointer data) struct frequencies_dialog fd; - GladeXML *xml = XML_NEW ("frequencies.glade"); + GtkBuilder *xml = builder_new ("frequencies.ui"); GtkWidget *dialog = get_widget_assert (xml, "frequencies-dialog"); GtkWidget *source = get_widget_assert (xml, "dict-treeview"); -- 2.30.2