GObject *
-get_object_assert (GtkBuilder *builder, const gchar *name)
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
{
GObject *o = NULL;
g_assert (name);
if ( !o )
g_critical ("Object \"%s\" could not be found\n", name);
+ 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;
}
-GtkWidget *
-get_widget_assert (gpointer x, const gchar *name)
-{
- GObject *obj = G_OBJECT (x);
- GtkWidget *w = NULL;
- g_assert (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);
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+ return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
- return w;
+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.
gtk_widget_destroy (dialog);
}
-static void
-connect_help_builder (GtkBuilder *xml)
+void
+connect_help (GtkBuilder *xml)
{
GSList *helps = gtk_builder_get_objects (xml);
g_slist_free (helps);
}
-static void
-connect_help_glade (GladeXML *xml)
-{
- GList *helps = glade_xml_get_widget_prefix (xml, "help_button_");
-
- 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);
-
- g_list_free (helps);
-}
-
-
-void
-connect_help (gpointer xml)
-{
- if (GTK_IS_BUILDER (xml))
- connect_help_builder (GTK_BUILDER (xml));
-
- else if (GLADE_IS_XML (xml))
- connect_help_glade (GLADE_XML (xml));
-
- else
- {
- g_error ("XML of type %s", G_OBJECT_TYPE_NAME (xml));
- }
-}
-
-
void
reference_manual (GtkMenuItem *menu, gpointer data)