From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Jul 2015 11:23:27 +0000 (+0300)
Subject: Fix mouse pointer on w32 when a menu is active
X-Git-Tag: emacs-25.0.90~1568
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65571b37ed5300546ea75da7888f73941011d0d0;p=emacs.git

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 fa26e67364c..6982eca84ac 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);