AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sending events for non-first wxJoystick buttons under MSW

Browse Source 
Fix bug introduced by the (relatively) recent wxJoystick rewrite: using
"!m_buttons" is wrong as it always returns 0 for any button(s) but the
first one, we need bit-wise "~m_buttons" here instead.

See https://github.com/wxWidgets/wxWidgets/pull/942

See #1142.
This commit is contained in:
Bartek Warzocha 2019-06-12 13:50:10 +02:00 committed by Vadim Zeitlin
parent 4cb1c8cab6
commit 7d5b467633
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/joystick.cpp
View File

@ -116,7 +116,7 @@ void* wxJoystickThread::Entry()
joyGetPos(m_joystick, &m_joyInfo);
m_buttons = m_joyInfo.wButtons;
UINT delta = m_buttons ^ m_lastJoyInfo.wButtons;
UINT deltaUp = delta & !m_buttons;
UINT deltaUp = delta & ~m_buttons;
UINT deltaDown = delta & m_buttons;
// Use count trailing zeros to determine which button changed.