graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

do the workaround for "" accelerators only if the GTK+ version is smaller

Browse source 
2004-06-14  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpactiongroup.c (gimp_action_group_add_*_actions):
	do the workaround for "" accelerators only if the GTK+ version
	is smaller than 2.4.3. Fixes bug #144342 for GTK+ >= 2.4.3.
This commit is contained in:
Michael Natterer 2004-06-14 14:38:59 +00:00 committed by Michael Natterer
parent 2b78805a89
commit 179c709509
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-06-14 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpactiongroup.c (gimp_action_group_add_*_actions):
do the workaround for "" accelerators only if the GTK+ version
is smaller than 2.4.3. Fixes bug #144342 for GTK+ >= 2.4.3.
2004-06-14 Sven Neumann <sven@gimp.org>
* app/core/gimpdrawable-transform.c: declared

36
app/widgets/gimpactiongroup.c
View file

@ -312,7 +312,11 @@ gimp_action_group_add_actions (GimpActionGroup *group,
entries[i].callback,
group->user_data);
if (entries[i].accelerator && ! entries[i].accelerator[0])
#ifdef __GNUC__
#warning FIXME: remove this has as soon as we depend on GTK+ 2.4.3
#endif
if (entries[i].accelerator && ! entries[i].accelerator[0] &&
gtk_check_version (2, 4, 3))
gtk_action_group_add_action (GTK_ACTION_GROUP (group),
GTK_ACTION (action));
else
@ -357,7 +361,11 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group,
entries[i].callback,
group->user_data);
if (entries[i].accelerator && ! entries[i].accelerator[0])
#ifdef __GNUC__
#warning FIXME: remove this has as soon as we depend on GTK+ 2.4.3
#endif
if (entries[i].accelerator && ! entries[i].accelerator[0] &&
gtk_check_version (2, 4, 3))
gtk_action_group_add_action (GTK_ACTION_GROUP (group),
GTK_ACTION (action));
else
@ -409,7 +417,11 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group,
if (value == entries[i].value)
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
if (entries[i].accelerator && ! entries[i].accelerator[0])
#ifdef __GNUC__
#warning FIXME: remove this has as soon as we depend on GTK+ 2.4.3
#endif
if (entries[i].accelerator && ! entries[i].accelerator[0] &&
gtk_check_version (2, 4, 3))
gtk_action_group_add_action (GTK_ACTION_GROUP (group),
GTK_ACTION (action));
else
@ -459,7 +471,11 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group,
callback,
group->user_data);
if (entries[i].accelerator && ! entries[i].accelerator[0])
#ifdef __GNUC__
#warning FIXME: remove this has as soon as we depend on GTK+ 2.4.3
#endif
if (entries[i].accelerator && ! entries[i].accelerator[0] &&
gtk_check_version (2, 4, 3))
gtk_action_group_add_action (GTK_ACTION_GROUP (group),
GTK_ACTION (action));
else
@ -504,7 +520,11 @@ gimp_action_group_add_string_actions (GimpActionGroup *group,
callback,
group->user_data);
if (entries[i].accelerator && ! entries[i].accelerator[0])
#ifdef __GNUC__
#warning FIXME: remove this has as soon as we depend on GTK+ 2.4.3
#endif
if (entries[i].accelerator && ! entries[i].accelerator[0] &&
gtk_check_version (2, 4, 3))
gtk_action_group_add_action (GTK_ACTION_GROUP (group),
GTK_ACTION (action));
else
@ -546,7 +566,11 @@ gimp_action_group_add_plug_in_actions (GimpActionGroup *group,
callback,
group->user_data);
if (entries[i].accelerator && ! entries[i].accelerator[0])
#ifdef __GNUC__
#warning FIXME: remove this has as soon as we depend on GTK+ 2.4.3
#endif
if (entries[i].accelerator && ! entries[i].accelerator[0] &&
gtk_check_version (2, 4, 3))
gtk_action_group_add_action (GTK_ACTION_GROUP (group),
GTK_ACTION (action));
else