@@ -287,11 +312,15 @@ if (labelw == NULL) { /* Build it */ labelw = GTK_LABEL(gtk_accel_label_new(local_label)); - gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE); gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE); gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5); - gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item)); - gtk_label_set_markup_with_mnemonic(labelw, local_label); + + if (has_mnemonic(in_label, FALSE)) { + gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE); + gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item)); + gtk_label_set_markup_with_mnemonic(labelw, local_label); + } + gtk_widget_show(GTK_WIDGET(labelw));
/* Check to see if it needs to be in the bin for this
Surely the call to gtk_accel_label_set_accel_widget() should be outside of this conditional?
@@ -287,11 +312,15 @@ gtk_accel_ label_new( local_label) ); set_use_ underline( GTK_LABEL( labelw) , TRUE); label_set_ use_markup( GTK_LABEL( labelw) , TRUE); misc_set_ alignment( GTK_MISC( labelw) , 0.0, 0.5); label_set_ accel_widget( GTK_ACCEL_ LABEL(labelw) , GTK_WIDGET( menu_item) ); set_markup_ with_mnemonic( labelw, local_label); in_label, FALSE)) { set_use_ underline( GTK_LABEL( labelw) , TRUE); label_set_ accel_widget( GTK_ACCEL_ LABEL(labelw) , GTK_WIDGET( menu_item) ); set_markup_ with_mnemonic( labelw, local_label); widget_ show(GTK_ WIDGET( labelw) );
if (labelw == NULL) {
/* Build it */
labelw = GTK_LABEL(
- gtk_label_
gtk_
gtk_
- gtk_accel_
- gtk_label_
+
+ if (has_mnemonic(
+ gtk_label_
+ gtk_accel_
+ gtk_label_
+ }
+
gtk_
/* Check to see if it needs to be in the bin for this
Surely the call to gtk_accel_ label_set_ accel_widget( ) should be outside of this conditional?