Mercurial > emacs
comparison src/gtkutil.c @ 77574:b3ee2b840a3b
(xg_update_menubar, create_menus): Create empty
submenu for menu bar items.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Fri, 27 Apr 2007 06:39:33 +0000 |
parents | bb6e75c27940 |
children | 922696f363b0 41aaac7180d5 70bf32a0f523 |
comparison
equal
deleted
inserted
replaced
77573:c7e360cec7a2 | 77574:b3ee2b840a3b |
---|---|
2190 item->contents ? 0 : select_cb, | 2190 item->contents ? 0 : select_cb, |
2191 highlight_cb, | 2191 highlight_cb, |
2192 cl_data, | 2192 cl_data, |
2193 &group); | 2193 &group); |
2194 | 2194 |
2195 if (item->contents) | 2195 /* Create a possibly empty submenu for menu bar items, since some |
2196 themes don't highlight items correctly without it. */ | |
2197 if (item->contents || menu_bar_p) | |
2196 { | 2198 { |
2197 GtkWidget *submenu = create_menus (item->contents, | 2199 GtkWidget *submenu = create_menus (item->contents, |
2198 f, | 2200 f, |
2199 select_cb, | 2201 select_cb, |
2200 deactivate_cb, | 2202 deactivate_cb, |
2477 select_cb, | 2479 select_cb, |
2478 highlight_cb, | 2480 highlight_cb, |
2479 cl_data, | 2481 cl_data, |
2480 &group); | 2482 &group); |
2481 | 2483 |
2484 /* Create a possibly empty submenu for menu bar items, since some | |
2485 themes don't highlight items correctly without it. */ | |
2486 GtkWidget *submenu = create_menus (NULL, f, | |
2487 select_cb, NULL, highlight_cb, | |
2488 0, 0, 0, 0, cl_data, 0); | |
2482 gtk_widget_set_name (w, MENU_ITEM_NAME); | 2489 gtk_widget_set_name (w, MENU_ITEM_NAME); |
2483 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos); | 2490 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos); |
2491 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); | |
2484 | 2492 |
2485 g_list_free (*list); | 2493 g_list_free (*list); |
2486 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | 2494 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); |
2487 while (nr-- > 0) iter = g_list_next (iter); | 2495 while (nr-- > 0) iter = g_list_next (iter); |
2488 iter = g_list_next (iter); | 2496 iter = g_list_next (iter); |