From 60797e52a64da2d4403a7dfaf333b13b7687ba79 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 22 Jul 2023 14:06:08 +0800 Subject: [PATCH] Fix window box computation for menu bar windows * src/window.h (WINDOW_MENU_BAR_P): Check for external menu bars using HAVE_WINDOW_SYSTEM && HAVE_EXT_MENU_BAR instead of hard coding X without Xt or GTK. --- src/window.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/window.h b/src/window.h index 2a86d27d1d4..413293420fd 100644 --- a/src/window.h +++ b/src/window.h @@ -759,14 +759,14 @@ wset_next_buffers (struct window *w, Lisp_Object val) + WINDOW_RIGHT_PIXEL_EDGE (W)) /* True if W is a menu bar window. */ -#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) +#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR #define WINDOW_MENU_BAR_P(W) \ (WINDOWP (WINDOW_XFRAME (W)->menu_bar_window) \ && (W) == XWINDOW (WINDOW_XFRAME (W)->menu_bar_window)) -#else +#else /* !HAVE_WINDOW_SYSTEM || HAVE_EXT_MENU_BAR */ /* No menu bar windows if X toolkit is in use. */ #define WINDOW_MENU_BAR_P(W) false -#endif +#endif /* HAVE_WINDOW_SYSTEM && !HAVE_EXT_MENU_BAR */ /* True if W is a tab bar window. */ #if defined (HAVE_WINDOW_SYSTEM) -- 2.39.5