X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=a65764f4487d239c8b3bb76694be16a4e3795ab9;hb=4cf49191fb83586ae05ed9613ce229417c106055;hp=12003e2ac23f8a48ec17a348c8aaca970921dd67;hpb=4c4f035bfad520dc54f0d5a9e30e36d4fb009efc;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 12003e2ac2..a65764f448 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -34,6 +34,7 @@
 #include <data/casereader-provider.h>
 #include <libpspp/message.h>
 
+#include <gtk/gtkbuilder.h>
 #include <libpspp/i18n.h>
 
 #include <ctype.h>
@@ -102,19 +103,53 @@ text_to_value (const gchar *text, union value *v,
 }
 
 
-GtkWidget *
-get_widget_assert (GladeXML *xml, const gchar *name)
+GtkBuilder *
+builder_new_real (const gchar *name)
 {
-  GtkWidget *w;
-  g_assert (xml);
+  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;
+}
+
+
+GObject *
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
+{
+  GObject *o = NULL;
   g_assert (name);
 
-  w = glade_xml_get_widget (xml, name);
+  o = gtk_builder_get_object (builder, name);
 
-  if ( !w )
-    g_critical ("Widget \"%s\" could not be found\n", name);
+  if ( !o )
+    g_critical ("Object \"%s\" could not be found\n", name);
 
-  return w;
+  if ( ! g_type_is_a (G_OBJECT_TYPE (o), type))
+   {
+     g_critical ("Object \"%s\" was expected to have type %s, but in fact has type %s", 
+	name, g_type_name (type), G_OBJECT_TYPE_NAME (o));
+   }
+
+  return o;
+}
+
+
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+  return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
+
+GtkWidget *
+get_widget_assert (GtkBuilder *builder, const gchar *name)
+{
+  return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
 }
 
 /* Converts a string in the pspp locale to utf-8.
@@ -145,18 +180,35 @@ give_help (void)
 }
 
 void
-connect_help (GladeXML *xml)
+connect_help (GtkBuilder *xml)
 {
-  GList *helps = glade_xml_get_widget_prefix (xml, "help_button_");
+  GSList *helps = gtk_builder_get_objects (xml);
 
-  GList *i;
-  for ( i = g_list_first (helps); i ; i = g_list_next (i))
-    g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0);
+  GSList *i;
+  for ( i = helps; i ; i = g_slist_next (i))
+    {
+      GObject *o = i->data;
+      if ( GTK_IS_WIDGET (o) )
+	{
+	  gchar *name = NULL;
+	  gchar s[12] = {0};
+	  g_object_get (o, "name", &name, NULL);
 
-  g_list_free (helps);
-}
+	  if ( name)
+	    strncpy (s, name, 11);
+	  s[11] = '\0';
 
 
+	  if ( 0 == strcmp ("help_button", s))
+	    {
+	    g_signal_connect (GTK_WIDGET (o), "clicked", give_help, 0);
+	    }
+	}
+    }
+
+  g_slist_free (helps);
+}
+
 
 void
 reference_manual (GtkMenuItem *menu, gpointer data)
@@ -299,8 +351,6 @@ clone_list_store (const GtkListStore *src)
 }
 
 
-
-
 void
 paste_syntax_in_new_window (const gchar *syntax)
 {