diff options
author | Eli Zaretskii <eliz@gnu.org> | 2015-07-04 14:23:27 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2015-07-04 14:23:27 +0300 |
commit | 65571b37ed5300546ea75da7888f73941011d0d0 (patch) | |
tree | f885fd20b0544ffe7c2de6359d46724870b24ef0 | |
parent | cdd5e86967e0a3d23da3079dc5b17ace699e66b3 (diff) | |
download | emacs-65571b37ed5300546ea75da7888f73941011d0d0.tar.gz |
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.
-rw-r--r-- | src/w32fns.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |