From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 25 Feb 1996 06:59:59 +0000 (+0000)
Subject: (lw_window_is_in_menubar) [USE_MOTIF]:
X-Git-Tag: emacs-19.34~1197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c17d59fcd2ba238f4929755788585f5538190744;p=emacs.git

(lw_window_is_in_menubar) [USE_MOTIF]:
With Motif, the window WIN can be the menu bar widget itself.
---

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 6569b38da32..f71f6ef6d57 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1345,9 +1345,10 @@ lw_window_is_in_menubar (win, menubar_widget)
       && XtWindow (menubar_widget) == win;
 #endif
 #if defined (USE_MOTIF)
-      && XtWindowToWidget (XtDisplay (menubar_widget), win)
-      && (XtParent (XtWindowToWidget (XtDisplay (menubar_widget), win))
-	  == menubar_widget);
+      && ((XtWindow (menubar_widget) == win)
+	  || (XtWindowToWidget (XtDisplay (menubar_widget), win)
+	      && (XtParent (XtWindowToWidget (XtDisplay (menubar_widget), win))
+		  == menubar_widget)));
 #endif
 }