Mercurial > emacs
changeset 67527:88807d05a058
* xmenu.c (menubar_selection_callback): Do nothing if the callback
is for an unselected radio menu item.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 12 Dec 2005 08:08:43 +0000 |
| parents | a1f2e352a862 |
| children | c5c00342184b |
| files | src/xmenu.c |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmenu.c Mon Dec 12 08:08:23 2005 +0000 +++ b/src/xmenu.c Mon Dec 12 08:08:43 2005 +0000 @@ -1572,6 +1572,15 @@ if (! cb_data || ! cb_data->cl_data || ! cb_data->cl_data->f) return; + /* For a group of radio buttons, GTK calls the selection callback first + for the item that was active before the selection and then for the one that + is active after the selection. For C-h k this means we get the help on + the deselected item and then the selected item is executed. Prevent that + by ignoring the non-active item. */ + if (GTK_IS_RADIO_MENU_ITEM (widget) + && ! gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) + return; + /* When a menu is popped down, X generates a focus event (i.e. focus goes back to the frame below the menu). Since GTK buffers events, we force it out here before the menu selection event. Otherwise @@ -1891,7 +1900,7 @@ { if (STRINGP (wv->lname)) { - wv->name = SDATA (wv->lname); + wv->name = (char *) SDATA (wv->lname); /* Ignore the @ that means "separate pane". This is a kludge, but this isn't worth more time. */ @@ -1904,7 +1913,7 @@ } if (STRINGP (wv->lkey)) - wv->key = SDATA (wv->lkey); + wv->key = (char *) SDATA (wv->lkey); if (wv->contents) update_submenu_strings (wv->contents);