(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 6569b38da329ef4efb4ea89efaa38138f2fb500c..f71f6ef6d57751306c896415800e64ad07cf1736 100644 (file)
--- 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
 }