Mercurial > emacs

comparison src/xdisp.c @ 14265:9bc9be522a4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P instead of only testing for X11.
author Geoff Voelker <voelker@cs.washington.edu>
date Tue, 23 Jan 1996 18:56:15 +0000
parents 082e86e9bca3
children 037a89c9d068
comparison
equal deleted inserted replaced
14264:215d8ba39537 14265:9bc9be522a4d
1285 w = XWINDOW (window); 1285 w = XWINDOW (window);
1286 1286
1287 if (update_mode_lines) 1287 if (update_mode_lines)
1288 w->update_mode_line = Qt; 1288 w->update_mode_line = Qt;
1289 1289
1290 if (FRAME_X_P (f) 1290 if (FRAME_WINDOW_P (f)
1291 ? 1291 ?
1292 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) 1292 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
1293 FRAME_EXTERNAL_MENU_BAR (f) 1293 FRAME_EXTERNAL_MENU_BAR (f)
1294 #else 1294 #else
1295 FRAME_MENU_BAR_LINES (f) > 0 1295 FRAME_MENU_BAR_LINES (f) > 0
1331 if (! NILP (Vlucid_menu_bar_dirty_flag)) 1331 if (! NILP (Vlucid_menu_bar_dirty_flag))
1332 call0 (Qrecompute_lucid_menubar); 1332 call0 (Qrecompute_lucid_menubar);
1333 call1 (Vrun_hooks, Qmenu_bar_update_hook); 1333 call1 (Vrun_hooks, Qmenu_bar_update_hook);
1334 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); 1334 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
1335 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) 1335 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
1336 if (FRAME_X_P (f)) 1336 if (FRAME_WINDOW_P (f))
1337 set_frame_menubar (f, 0, 0); 1337 set_frame_menubar (f, 0, 0);
1338 #endif /* USE_X_TOOLKIT || HAVE_NTGUI */ 1338 #endif /* USE_X_TOOLKIT || HAVE_NTGUI */
1339 1339
1340 unbind_to (count, Qnil); 1340 unbind_to (count, Qnil);
1341 set_buffer_internal_1 (prev); 1341 set_buffer_internal_1 (prev);
1752 w->base_line_number = Qnil; 1752 w->base_line_number = Qnil;
1753 } 1753 }
1754 1754
1755 /* When we reach a frame's selected window, redo the frame's menu bar. */ 1755 /* When we reach a frame's selected window, redo the frame's menu bar. */
1756 if (update_mode_line 1756 if (update_mode_line
1757 && (FRAME_X_P (f) 1757 && (FRAME_WINDOW_P (f)
1758 ? 1758 ?
1759 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) 1759 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
1760 FRAME_EXTERNAL_MENU_BAR (f) 1760 FRAME_EXTERNAL_MENU_BAR (f)
1761 #else 1761 #else
1762 FRAME_MENU_BAR_LINES (f) > 0 1762 FRAME_MENU_BAR_LINES (f) > 0