From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 7 Dec 2000 12:33:32 +0000 (+0000)
Subject: (xm_arm_callback): Fix last change.
X-Git-Tag: emacs-pretest-21.0.93~109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=27e3b1a140b8d53683dc8f05546212424b99c543;p=emacs.git

(xm_arm_callback): Fix last change.
---

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 4a3f097a867..2cbcba4c1a0 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -265,26 +265,23 @@ xm_arm_callback (w, client_data, call_data)
   widget_value *wv = (widget_value *) client_data;
   widget_instance *instance;
 
-  /* During the pretest of 21.1, there was a case where this callback
-     was called with a null widget on hpux 10.2.  I think that's
-     likely a bug in the Motif lib there.  */
-  if (w != None)
+  /* Get the id of the menu bar or popup menu this widget is in.  */
+  while (w != None)
     {
-      /* Get the id of the menu bar or popup menu this widget is in.  */
-      while (1)
+      if (XmIsRowColumn (w))
 	{
-	  if (XmIsRowColumn (w))
-	    {
-	      unsigned char type = 0xff;
-
-	      XtVaGetValues (w, XmNrowColumnType, &type, NULL);
-	      if (type == XmMENU_BAR || type == XmMENU_POPUP)
-		break;
-	    }
+	  unsigned char type = 0xff;
 
-	  w = XtParent (w);
+	  XtVaGetValues (w, XmNrowColumnType, &type, NULL);
+	  if (type == XmMENU_BAR || type == XmMENU_POPUP)
+	    break;
 	}
 
+      w = XtParent (w);
+    }
+
+  if (w != None)
+    {
       instance = lw_get_widget_instance (w);
       if (instance && instance->info->highlight_cb)
 	{