From dc937613b0cbe6ff8cc4c4819e7b93cf05334b6f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 11 Nov 1995 15:55:13 +0000 Subject: [PATCH] (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. --- src/xdisp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 645c684434..2d1b7d4c84 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1286,7 +1286,7 @@ update_menu_bar (f, save_match_data) if (FRAME_X_P (f) ? -#ifdef FRAME_EXTERNAL_MENU_BAR +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) FRAME_EXTERNAL_MENU_BAR (f) #else FRAME_MENU_BAR_LINES (f) > 0 @@ -1745,7 +1745,7 @@ done: if (update_mode_line && (FRAME_X_P (f) ? -#ifdef FRAME_EXTERNAL_MENU_BAR +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) FRAME_EXTERNAL_MENU_BAR (f) #else FRAME_MENU_BAR_LINES (f) > 0 @@ -3169,10 +3169,14 @@ display_menu_bar (w) int hpos = 0; int i; -#if !defined (USE_X_TOOLKIT) && !defined (HAVE_NTGUI) +#ifdef HAVE_NTGUI + return; +#endif + +#ifdef USE_X_TOOLKIT if (FRAME_X_P (f)) return; -#endif /* not USE_X_TOOLKIT and not HAVE_NTGUI */ +#endif /* USE_X_TOOLKIT */ get_display_line (f, vpos, 0); -- 2.39.2