# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 976192412 0
# Node ID 8a6f81835a8dc37dd8296e0cb12a090f9981fabc
# Parent  9afdcab7bfa5004975c9d9a7f53ee59b65c049a1
(xm_arm_callback): Fix last change.

diff -r 9afdcab7bfa5 -r 8a6f81835a8d lwlib/lwlib-Xm.c
--- a/lwlib/lwlib-Xm.c	Thu Dec 07 12:20:55 2000 +0000
+++ b/lwlib/lwlib-Xm.c	Thu Dec 07 12:33:32 2000 +0000
@@ -265,26 +265,23 @@
   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.  */
+  /* Get the id of the menu bar or popup menu this widget is in.  */
+  while (w != None)
+    {
+      if (XmIsRowColumn (w))
+	{
+	  unsigned char type = 0xff;
+
+	  XtVaGetValues (w, XmNrowColumnType, &type, NULL);
+	  if (type == XmMENU_BAR || type == XmMENU_POPUP)
+	    break;
+	}
+
+      w = XtParent (w);
+    }
+
   if (w != None)
     {
-      /* Get the id of the menu bar or popup menu this widget is in.  */
-      while (1)
-	{
-	  if (XmIsRowColumn (w))
-	    {
-	      unsigned char type = 0xff;
-
-	      XtVaGetValues (w, XmNrowColumnType, &type, NULL);
-	      if (type == XmMENU_BAR || type == XmMENU_POPUP)
-		break;
-	    }
-
-	  w = XtParent (w);
-	}
-
       instance = lw_get_widget_instance (w);
       if (instance && instance->info->highlight_cb)
 	{