# HG changeset patch
# User Geoff Voelker <voelker@cs.washington.edu>
# Date 822423375 0
# Node ID 9bc9be522a4d06c5abe2ca513e83f9492c280e88
# Parent  215d8ba39537f0bb4791079e1db1c66ff2c2b387
(update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
instead of only testing for X11.

diff -r 215d8ba39537 -r 9bc9be522a4d src/xdisp.c
--- a/src/xdisp.c	Tue Jan 23 18:06:54 1996 +0000
+++ b/src/xdisp.c	Tue Jan 23 18:56:15 1996 +0000
@@ -1287,7 +1287,7 @@
   if (update_mode_lines)
     w->update_mode_line = Qt;
 
-  if (FRAME_X_P (f)
+  if (FRAME_WINDOW_P (f)
       ?
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
       FRAME_EXTERNAL_MENU_BAR (f) 
@@ -1333,7 +1333,7 @@
 	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
 	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
-	  if (FRAME_X_P (f))
+	  if (FRAME_WINDOW_P (f))
 	    set_frame_menubar (f, 0, 0);
 #endif /* USE_X_TOOLKIT || HAVE_NTGUI */
 
@@ -1754,7 +1754,7 @@
 
   /* When we reach a frame's selected window, redo the frame's menu bar.  */
   if (update_mode_line
-      && (FRAME_X_P (f)
+      && (FRAME_WINDOW_P (f)
 	  ?
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
 	  FRAME_EXTERNAL_MENU_BAR (f)