comparison src/gui_gtk_x11.c @ 827:fd1b3406fd1c v7.0d02

updated for version 7.0d02
author vimboss
date Wed, 12 Apr 2006 21:52:12 +0000
parents 8dd456c1e283
children 5117153003bd
comparison
equal deleted inserted replaced
826:1cdd2661f34c 827:fd1b3406fd1c
3560 # endif 3560 # endif
3561 } 3561 }
3562 else 3562 else
3563 # endif /* FEAT_GUI_GNOME */ 3563 # endif /* FEAT_GUI_GNOME */
3564 { 3564 {
3565 if (vim_strchr(p_go, GO_MENUS) != NULL) 3565 /* Always show the menubar, otherwise <F10> doesn't work. It may be
3566 gtk_widget_show(gui.menubar); 3566 * disabled in gui_init() later. */
3567 gtk_widget_show(gui.menubar);
3567 gtk_box_pack_start(GTK_BOX(vbox), gui.menubar, FALSE, FALSE, 0); 3568 gtk_box_pack_start(GTK_BOX(vbox), gui.menubar, FALSE, FALSE, 0);
3568 } 3569 }
3569 #endif /* FEAT_MENU */ 3570 #endif /* FEAT_MENU */
3570 3571
3571 #ifdef FEAT_TOOLBAR 3572 #ifdef FEAT_TOOLBAR
4364 widget = gui.menubar_h; 4365 widget = gui.menubar_h;
4365 else 4366 else
4366 # endif 4367 # endif
4367 widget = gui.menubar; 4368 widget = gui.menubar;
4368 4369
4369 if (!showit != !GTK_WIDGET_VISIBLE(widget)) 4370 /* Do not disable the menu while starting up, otherwise F10 doesn't work. */
4371 if (!showit != !GTK_WIDGET_VISIBLE(widget) && !gui.starting)
4370 { 4372 {
4371 if (showit) 4373 if (showit)
4372 gtk_widget_show(widget); 4374 gtk_widget_show(widget);
4373 else 4375 else
4374 gtk_widget_hide(widget); 4376 gtk_widget_hide(widget);