#include <data/casereader-provider.h>
#include <libpspp/message.h>
+#include <gtk/gtkbuilder.h>
#include <libpspp/i18n.h>
#include <ctype.h>
}
+GtkBuilder *
+builder_new_real (const gchar *name)
+{
+ GtkBuilder *builder = gtk_builder_new ();
+
+ GError *err = NULL;
+ if ( ! gtk_builder_add_from_file (builder, name, &err))
+ {
+ g_critical ("Couldnt open user interface file %s: %s", name, err->message);
+ g_clear_error (&err);
+ }
+
+ return builder;
+}
+
+
+
GtkWidget *
-get_widget_assert (GladeXML *xml, const gchar *name)
+get_widget_assert (gpointer x, const gchar *name)
{
- GtkWidget *w;
- g_assert (xml);
+ GObject *obj = G_OBJECT (x);
+ GtkWidget *w = NULL;
g_assert (name);
- w = glade_xml_get_widget (xml, name);
+ if (GTK_IS_BUILDER (obj))
+ w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name));
+
+ if (GLADE_IS_XML (obj))
+ w = glade_xml_get_widget (GLADE_XML (obj), name);
if ( !w )
g_critical ("Widget \"%s\" could not be found\n", name);
reader = proc_extract_active_file_data (the_dataset);
if (!lazy_casereader_destroy (reader, lazy_serial))
- psppire_data_store_set_case_file (the_data_store,
- psppire_case_file_new (reader));
+ psppire_data_store_set_reader (the_data_store, reader);
som_flush ();
}
+