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

Respect deprecated menu images setting

Browse Source 
I have been convinced that it is a bad idea to change the behaviour
at the same time as deprecating it, so go back to respecting the
Gtk/MenuImages xsetting in GtkImageMenuItem when it is set.

The setting as well as the widget are still deprecated, and the
default value of the setting will remain FALSE.
This commit is contained in:
Matthias Clasen
2013-10-24 20:03:02 -04:00
parent e735da37f6
commit 627a03683f
4 changed files with 94 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/deprecated/gtkaction.c
View File

@ -497,7 +497,8 @@ gtk_action_class_init (GtkActionClass *klass)
/**
* GtkAction:always-show-image:
*
* If %TRUE, the action's menu item proxies will always show their image, if available.
* If %TRUE, the action's menu item proxies will ignore the #GtkSettings:gtk-menu-images
* setting and always show their image, if available.
*
* Use this property if the menu item would be useless or hard to use
* without their image.
@ -1352,8 +1353,8 @@ gtk_action_get_is_important (GtkAction *action)
* @action: a #GtkAction
* @always_show: %TRUE if menuitem proxies should always show their image
*
* Sets whether @action<!-- -->'s menu item proxies will always show
* their image, if available.
* Sets whether @action<!-- -->'s menu item proxies will ignore the
* #GtkSettings:gtk-menu-images setting and always show their image, if available.
*
* Use this if the menu item would be useless or hard to use
* without their image.