callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added gimp_help_id_quark() which is G_GNUC_CONST and a new macro

Browse Source 
2004-05-03  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimphelpui.[ch]: added gimp_help_id_quark()
	which is G_GNUC_CONST and a new macro GIMP_HELP_ID as shortcut.

	* app/widgets/gimpactiongroup.c (gimp_action_group_add_*_actions):
	attach the help ID to the action using the new quark key. Call
	gtk_action_group_add_action() instead of the _with_accel() variant
	if the accel is the empty string (== if we explicitely want no
	accel even if the stock item specifies one). Fixes warning flood
	with GTK+ 2.4.1.
This commit is contained in:
Michael Natterer
2004-05-03 15:54:54 +00:00
committed by Michael Natterer
parent 311f033d34
commit 6e35e2333f
4 changed files with 115 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libgimpwidgets/gimphelpui.c
View File

@ -210,7 +210,7 @@ gimp_help_set_help_data (GtkWidget *widget,
if (tooltip)
gtk_tooltips_set_tip (tool_tips, widget, tooltip, help_id);
else
g_object_set_data (G_OBJECT (widget), "gimp-help-id", (gpointer) help_id);
g_object_set_qdata (G_OBJECT (widget), GIMP_HELP_ID, (gpointer) help_id);
}
/**
@ -236,6 +236,25 @@ gimp_context_help (GtkWidget *widget)
gimp_help_callback (widget, GTK_WIDGET_HELP_WHATS_THIS, NULL);
}
/**
* gimp_help_id_quark:
*
* This function returns the #GQuark which should be used as key when
* attachind help IDs to widgets and objects.
*
* Return value: The #GQuark.
**/
GQuark
gimp_help_id_quark (void)
{
static GQuark quark = 0;
if (! quark)
quark = g_quark_from_static_string ("gimp-help-id");
return quark;
}
/* private functions */
@ -255,7 +274,7 @@ gimp_help_get_help_data (GtkWidget *widget,
if (tooltips_data && tooltips_data->tip_private)
help_id = tooltips_data->tip_private;
else
help_id = g_object_get_data (G_OBJECT (widget), "gimp-help-id");
help_id = g_object_get_qdata (G_OBJECT (widget), GIMP_HELP_ID);
help_data = g_object_get_data (G_OBJECT (widget), "gimp-help-data");