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

Fix #673243: accelerators not visible on GtkRadioMenu

Browse Source 
Also fixes a bug in set_property handler, where setting group to NULL would
cause a warning.

Signed-off-by: jjacky <i.am.jack.mail@gmail.com>
This commit is contained in:
jjacky
2013-02-14 19:56:54 +01:00
committed by Cosimo Cecchi
parent fbc0572068
commit e916568781
1 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkradiomenuitem.c
View File

@ -127,10 +127,9 @@ gtk_radio_menu_item_set_property (GObject *object,
GSList *slist; GSList *slist;
case PROP_GROUP: case PROP_GROUP:
if (G_VALUE_HOLDS_OBJECT (value)) slist = g_value_get_object (value);
slist = gtk_radio_menu_item_get_group ((GtkRadioMenuItem*) g_value_get_object (value)); if (slist)
else slist = gtk_radio_menu_item_get_group ((GtkRadioMenuItem*) g_value_get_object (value));
slist = NULL;
gtk_radio_menu_item_set_group (radio_menu_item, slist); gtk_radio_menu_item_set_group (radio_menu_item, slist);
break; break;
default: default:
@ -249,18 +248,10 @@ GtkWidget*
gtk_radio_menu_item_new_with_label (GSList *group, gtk_radio_menu_item_new_with_label (GSList *group,
const gchar *label) const gchar *label)
{ {
GtkWidget *radio_menu_item; return g_object_new (GTK_TYPE_RADIO_MENU_ITEM,
GtkWidget *accel_label; "group", (group) ? group->data : NULL,
"label", label,
radio_menu_item = gtk_radio_menu_item_new (group); NULL);
accel_label = gtk_accel_label_new (label);
gtk_widget_set_halign (accel_label, GTK_ALIGN_START);
gtk_widget_set_valign (accel_label, GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (radio_menu_item), accel_label);
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), radio_menu_item);
gtk_widget_show (accel_label);
return radio_menu_item;
} }
@ -280,20 +271,11 @@ GtkWidget*
gtk_radio_menu_item_new_with_mnemonic (GSList *group, gtk_radio_menu_item_new_with_mnemonic (GSList *group,
const gchar *label) const gchar *label)
{ {
GtkWidget *radio_menu_item; return g_object_new (GTK_TYPE_RADIO_MENU_ITEM,
GtkWidget *accel_label; "group", (group) ? group->data : NULL,
"label", label,
radio_menu_item = gtk_radio_menu_item_new (group); "use-underline", TRUE,
accel_label = g_object_new (GTK_TYPE_ACCEL_LABEL, NULL); NULL);
gtk_label_set_text_with_mnemonic (GTK_LABEL (accel_label), label);
gtk_widget_set_halign (accel_label, GTK_ALIGN_START);
gtk_widget_set_valign (accel_label, GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (radio_menu_item), accel_label);
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), radio_menu_item);
gtk_widget_show (accel_label);
return radio_menu_item;
} }
/** /**