Merge commit 'origin/stable'
[pspp-builds.git] / src / ui / gui / crosstabs-dialog.c
index 663599f331c6a4306200fed2a1ac040cadbaca7b..2c50b461844d38de4587e1bcc9fcad01212b4d04 100644 (file)
 #include "crosstabs-dialog.h"
 
 #include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
 #include <stdlib.h>
 
 #include <language/syntax-string-source.h>
 #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>
@@ -390,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");