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.

diff --git a/src/w32fns.c b/src/w32fns.c
index fa26e67364c7f9ec788cc3442f8db3f00b3931ff..6982eca84acbf137476196d77181c3be11dd3447 100644 (file)
--- 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);