[Emacs-diffs] master 65571b3: Fix mouse pointer on w32 when a menu is active

[Eli Zaretskii]

branch: master
commit 65571b37ed5300546ea75da7888f73941011d0d0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix mouse pointer on w32 when a menu is active
    
    * src/w32fns.c (w32_wnd_proc): Don't change the mouse pointer
    shape while a menu is in use.  This started happening since we now
    send WM_EMACS_SHOWCURSOR messages when the mouse moves.
---
 src/w32fns.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/w32fns.c b/src/w32fns.c
index fa26e67..6982eca 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4015,7 +4015,9 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM 
lParam)
        if (f && cursor)
          {
            f->output_data.w32->current_cursor = cursor;
-           if (!f->output_data.w32->hourglass_p)
+           /* Don't change the cursor while menu-bar menu is in use.  */
+           if (!f->output_data.w32->menubar_active
+               && !f->output_data.w32->hourglass_p)
              {
                if (f->pointer_invisible)
                  SetCursor (NULL);