comparison src/menubar-x.c @ 26:441bb1e64a06 r19-15b96

Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents 0293115a14e9
children 1a767b41a199
comparison
equal deleted inserted replaced
25:383a494979f8 26:441bb1e64a06
644 (f->menubar_changed 644 (f->menubar_changed
645 || NILP (FRAME_MENUBAR_DATA (f)) 645 || NILP (FRAME_MENUBAR_DATA (f))
646 || (!EQ (XFRAME_MENUBAR_DATA (f)->last_menubar_buffer, 646 || (!EQ (XFRAME_MENUBAR_DATA (f)->last_menubar_buffer,
647 XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer))); 647 XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer)));
648 648
649 int menubar_was_visible = XtIsManaged (FRAME_X_MENUBAR_WIDGET (f)); 649 Boolean menubar_was_visible = XtIsManaged (FRAME_X_MENUBAR_WIDGET (f));
650 int menubar_will_be_visible = menubar_was_visible; 650 Boolean menubar_will_be_visible = menubar_was_visible;
651 int menubar_visibility_changed; 651 Boolean menubar_visibility_changed;
652 Cardinal new_num_top_widgets = 1; /* for the menubar */ 652 Cardinal new_num_top_widgets = 1; /* for the menubar */
653 Widget container = FRAME_X_CONTAINER_WIDGET (f); 653 Widget container = FRAME_X_CONTAINER_WIDGET (f);
654 654
655 #ifdef ENERGIZE 655 #ifdef ENERGIZE
656 int *old_sheets = FRAME_X_CURRENT_PSHEETS (f); 656 int *old_sheets = FRAME_X_CURRENT_PSHEETS (f);