procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(xg_update_menubar, create_menus): Create empty

Browse source 
submenu for menu bar items.
This commit is contained in:
Jan Djärv 2007-04-27 06:39:45 +00:00
parent 3dbe4b5413
commit f56cff8836
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2007-04-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xmenu.c (xdialog_show): Call Fredisplay before showing the dialog.
* gtkutil.c (xg_update_menubar, create_menus): Create empty
submenu for menu bar items.
2007-04-24 Chong Yidong <cyd@stupidchicken.com>
* xdisp.c (redisplay_window): Use BEG_UNCHANGED and END_UNCHANGED

10
src/gtkutil.c
View file

@ -2192,7 +2192,9 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb,
cl_data,
&group);
if (item->contents)
/* Create a possibly empty submenu for menu bar items, since some
themes don't highlight items correctly without it. */
if (item->contents || menu_bar_p)
{
GtkWidget *submenu = create_menus (item->contents,
f,
@ -2479,8 +2481,14 @@ xg_update_menubar (menubar, f, list, iter, pos, val,
cl_data,
&group);
/* Create a possibly empty submenu for menu bar items, since some
themes don't highlight items correctly without it. */
GtkWidget *submenu = create_menus (NULL, f,
select_cb, NULL, highlight_cb,
0, 0, 0, 0, cl_data, 0);
gtk_widget_set_name (w, MENU_ITEM_NAME);
gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu);
g_list_free (*list);
*list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));