From 6382eac6d85409a43b9a3b96cd303338de582f65 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Jun 2009 22:08:31 -0400 Subject: [PATCH] Fix an oversight in mnemonic handling In some situations, GtkButton would ignore the use-underline property. This was reported in bug 586330. --- gtk/gtkbutton.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index d749344a05..43ec81853b 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -997,9 +997,14 @@ gtk_button_construct_child (GtkButton *button) if (label_text) { - label = gtk_label_new_with_mnemonic (label_text); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), - GTK_WIDGET (button)); + if (button->use_underline) + { + label = gtk_label_new_with_mnemonic (label_text); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), + GTK_WIDGET (button)); + } + else + label = gtk_label_new (label_text); if (priv->image_position == GTK_POS_RIGHT || priv->image_position == GTK_POS_BOTTOM)