projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use GtkHPaned in variable info dialog
[pspp-builds.git]
/
src
/
ui
/
gui
/
helper.c
diff --git
a/src/ui/gui/helper.c
b/src/ui/gui/helper.c
index aa052c0768d78e08475cd169ca5a56f4175ecf95..49dbfda4a181b18e4b9fccabaa8ed4e6a1c4aa18 100644
(file)
--- a/
src/ui/gui/helper.c
+++ b/
src/ui/gui/helper.c
@@
-120,7
+120,7
@@
builder_new_real (const gchar *name)
GObject *
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);
{
GObject *o = NULL;
g_assert (name);
@@
-130,23
+130,26
@@
get_object_assert (GtkBuilder *builder, const gchar *name)
if ( !o )
g_critical ("Object \"%s\" could not be found\n", 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;
}
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 ( !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.
}
/* Converts a string in the pspp locale to utf-8.
@@
-198,7
+201,7
@@
connect_help (GtkBuilder *xml)
if ( 0 == strcmp ("help_button", s))
{
if ( 0 == strcmp ("help_button", s))
{
- g_signal_connect (
GTK_WIDGET (o)
, "clicked", give_help, 0);
+ g_signal_connect (
o
, "clicked", give_help, 0);
}
}
}
}
}
}
@@
-211,10
+214,14
@@
void
reference_manual (GtkMenuItem *menu, gpointer data)
{
GError *err = NULL;
reference_manual (GtkMenuItem *menu, gpointer data)
{
GError *err = NULL;
- if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) )
+ gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml"));
+
+ if ( ! g_spawn_command_line_async (cmd, &err) )
{
msg (ME, _("Cannot open reference manual: %s"), err->message);
}
{
msg (ME, _("Cannot open reference manual: %s"), err->message);
}
+
+ g_free (cmd);
g_clear_error (&err);
}
g_clear_error (&err);
}