From 79170994fc65ae91746642fb3fad37fa5524c63a Mon Sep 17 00:00:00 2001 From: Trylz Date: Tue, 6 Mar 2018 16:15:31 -0500 Subject: [PATCH] Fix handling of second auxiliary mouse button events in wxMSW The test for AUX2 mouse button was wrong and checked whether the button was pressed, instead of checking whether the event was generated by it. Check the event source correctly by comparing wParam with XBUTTON2 and not MK_XBUTTON2. Closes https://github.com/wxWidgets/wxWidgets/pull/753 --- docs/changes.txt | 1 + src/msw/window.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 423d79f114..d2b8473fc8 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -78,6 +78,7 @@ wxGTK: wxMSW: - Fix hang after clearing wxTAB_TRAVERSAL style on a window with children. +- Fix handling of AUX2 mouse button events (Trylz). 3.1.1: (released 2018-02-19) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index ca8fccb9da..113b3b715d 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -5547,7 +5547,7 @@ bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags) case WM_XBUTTONDOWN: case WM_XBUTTONUP: case WM_XBUTTONDBLCLK: - if ( flags & MK_XBUTTON2 ) + if (HIWORD(flags) == XBUTTON2) msg += wxEVT_AUX2_DOWN - wxEVT_AUX1_DOWN; }