master 704a40ad75: Don't send help-echo on menu button arming not caused by motion events

[Po Lu]

branch: master
commit 704a40ad75fd01d7efafbb9db7b8d5ff403e44eb
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Don't send help-echo on menu button arming not caused by motion events
    
    * lwlib/lwlib-Xm.c (xm_arm_callback): Ignore arming if the arm
    was not caused by an EnterNotify or MotionNotify event.
---
 lwlib/lwlib-Xm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index fa60fc89d0..25b1cc6b12 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -290,7 +290,12 @@ xm_arm_callback (Widget w, XtPointer client_data, 
XtPointer call_data)
   if (w != NULL)
     {
       instance = lw_get_widget_instance (w);
-      if (instance && instance->info->highlight_cb)
+
+      if (instance && instance->info->highlight_cb
+         && (cbs->reason == XmCR_DISARM
+             || (cbs->event
+                 && (cbs->event->type == EnterNotify
+                     || cbs->event->type == MotionNotify))))
        {
          call_data = cbs->reason == XmCR_DISARM ? NULL : wv;
          instance->info->highlight_cb (w, instance->info->id, call_data);