AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix an oversight in mnemonic handling

Browse Source 
In some situations, GtkButton would ignore the use-underline
property. This was reported in bug 586330.
This commit is contained in:
Matthias Clasen 2009-06-18 22:08:31 -04:00
parent 68171b506f
commit 6382eac6d8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkbutton.c
View File

@ -996,10 +996,15 @@ gtk_button_construct_child (GtkButton *button)
gtk_box_pack_end (GTK_BOX (box), priv->image, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
if (label_text) if (label_text)
{
if (button->use_underline)
{ {
label = gtk_label_new_with_mnemonic (label_text); label = gtk_label_new_with_mnemonic (label_text);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), gtk_label_set_mnemonic_widget (GTK_LABEL (label),
GTK_WIDGET (button)); GTK_WIDGET (button));
}
else
label = gtk_label_new (label_text);
if (priv->image_position == GTK_POS_RIGHT || if (priv->image_position == GTK_POS_RIGHT ||
priv->image_position == GTK_POS_BOTTOM) priv->image_position == GTK_POS_BOTTOM)