Mercurial > emacs

comparison src/xdisp.c @ 13511:a0fd601c9d5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(display_menu_bar): Fix backwards conditional. (update_menu_bar, redisplay_window): Don't use FRAME_EXTERNAL_MENU_BAR in #ifdef, since it is always defined.
author Richard M. Stallman <rms@gnu.org>
date Sat, 11 Nov 1995 15:55:13 +0000
parents 96fdfde22e87
children aee6ea2166bc
comparison
equal deleted inserted replaced
13510:f4212b188d42 13511:a0fd601c9d5b
1284 if (update_mode_lines) 1284 if (update_mode_lines)
1285 w->update_mode_line = Qt; 1285 w->update_mode_line = Qt;
1286 1286
1287 if (FRAME_X_P (f) 1287 if (FRAME_X_P (f)
1288 ? 1288 ?
1289 #ifdef FRAME_EXTERNAL_MENU_BAR 1289 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
1290 FRAME_EXTERNAL_MENU_BAR (f) 1290 FRAME_EXTERNAL_MENU_BAR (f)
1291 #else 1291 #else
1292 FRAME_MENU_BAR_LINES (f) > 0 1292 FRAME_MENU_BAR_LINES (f) > 0
1293 #endif 1293 #endif
1294 : FRAME_MENU_BAR_LINES (f) > 0) 1294 : FRAME_MENU_BAR_LINES (f) > 0)
1743 1743
1744 /* When we reach a frame's selected window, redo the frame's menu bar. */ 1744 /* When we reach a frame's selected window, redo the frame's menu bar. */
1745 if (update_mode_line 1745 if (update_mode_line
1746 && (FRAME_X_P (f) 1746 && (FRAME_X_P (f)
1747 ? 1747 ?
1748 #ifdef FRAME_EXTERNAL_MENU_BAR 1748 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
1749 FRAME_EXTERNAL_MENU_BAR (f) 1749 FRAME_EXTERNAL_MENU_BAR (f)
1750 #else 1750 #else
1751 FRAME_MENU_BAR_LINES (f) > 0 1751 FRAME_MENU_BAR_LINES (f) > 0
1752 #endif 1752 #endif
1753 : FRAME_MENU_BAR_LINES (f) > 0) 1753 : FRAME_MENU_BAR_LINES (f) > 0)
3167 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); 3167 register FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
3168 int maxendcol = FRAME_WIDTH (f); 3168 int maxendcol = FRAME_WIDTH (f);
3169 int hpos = 0; 3169 int hpos = 0;
3170 int i; 3170 int i;
3171 3171
3172 #if !defined (USE_X_TOOLKIT) && !defined (HAVE_NTGUI) 3172 #ifdef HAVE_NTGUI
3173 return;
3174 #endif
3175
3176 #ifdef USE_X_TOOLKIT
3173 if (FRAME_X_P (f)) 3177 if (FRAME_X_P (f))
3174 return; 3178 return;
3175 #endif /* not USE_X_TOOLKIT and not HAVE_NTGUI */ 3179 #endif /* USE_X_TOOLKIT */
3176 3180
3177 get_display_line (f, vpos, 0); 3181 get_display_line (f, vpos, 0);
3178 3182
3179 items = FRAME_MENU_BAR_ITEMS (f); 3183 items = FRAME_MENU_BAR_ITEMS (f);
3180 for (i = 0; i < XVECTOR (items)->size; i += 3) 3184 for (i = 0; i < XVECTOR (items)->size; i += 3)