Mercurial > emacs

comparison src/gtkutil.c @ 83565:41aaac7180d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-708 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-709 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-710 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-711 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-712 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-713 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-714 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-715 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-716 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-717 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-718 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-719 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-720 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-721 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-722 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-723 Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change. * emacs@sv.gnu.org/emacs--devo--0--patch-724 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-725 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-726 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-727 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-728 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-729 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-730 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-731 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-732 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-733 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-734 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-735 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-736 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-737 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-738 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-739 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-740 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-741 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-742 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-743 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--rel--22--base-0 tag of emacs@sv.gnu.org/emacs--devo--0--patch-709 * emacs@sv.gnu.org/emacs--rel--22--patch-1 Sync to CVS tag EMACS_22_BRANCHPOINT * emacs@sv.gnu.org/emacs--rel--22--patch-2 Sync to CVS branch EMACS_22_BASE * emacs@sv.gnu.org/emacs--rel--22--patch-3 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-4 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-5 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-6 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-7 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-8 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-9 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-10 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-11 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-12 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-13 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-217 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-218 Merge from emacs--devo--0, emacs--rel--22 * emacs@sv.gnu.org/gnus--rel--5.10--patch-219 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-220 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-605
author Karoly Lorentey <karoly@lorentey.hu>
date Fri, 11 May 2007 18:24:42 +0000
parents dc002877ce12 1962a74982ce
children 65663fcd2caa
comparison
equal deleted inserted replaced
83564:8cb34e1b7bbb 83565:41aaac7180d5
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);