Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wxGetKeyState to get current status of non-togle keys, and to

Browse Source 
correctly test for the toggles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-21 00:36:36 +00:00
parent 89c876de1c
commit fdec2c0554
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/msw/window.cpp
View File

@@ -5023,8 +5023,10 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual)
case WXK_CLEAR: keySym = VK_CLEAR; break; case WXK_CLEAR: keySym = VK_CLEAR; break;
case WXK_SHIFT: keySym = VK_SHIFT; break; case WXK_SHIFT: keySym = VK_SHIFT; break;
case WXK_CONTROL: keySym = VK_CONTROL; break; case WXK_CONTROL: keySym = VK_CONTROL; break;
case WXK_ALT: keySym = VK_MENU; break;
case WXK_MENU : keySym = VK_MENU; break; case WXK_MENU : keySym = VK_MENU; break;
case WXK_PAUSE: keySym = VK_PAUSE; break; case WXK_PAUSE: keySym = VK_PAUSE; break;
case WXK_CAPITAL: keySym = VK_CAPITAL; break;
case WXK_PRIOR: keySym = VK_PRIOR; break; case WXK_PRIOR: keySym = VK_PRIOR; break;
case WXK_NEXT : keySym = VK_NEXT; break; case WXK_NEXT : keySym = VK_NEXT; break;
case WXK_END: keySym = VK_END; break; case WXK_END: keySym = VK_END; break;
@@ -5094,12 +5096,24 @@ bool wxGetKeyState(wxKeyCode key)
{ {
bool bVirtual; bool bVirtual;
int vkey = wxCharCodeWXToMSW(key, &bVirtual); int vkey = wxCharCodeWXToMSW(key, &bVirtual);
SHORT state;
//there aren't WXK_ macros for non-virtual key codes
if (bVirtual == false)
return false;
return GetKeyState(vkey) < 0; switch (key)
{
case WXK_NUMLOCK:
case WXK_CAPITAL:
case WXK_SCROLL:
// get the toggle state of the special key
state = GetKeyState(vkey);
break;
default:
// Get the current state of the physical key
state = GetAsyncKeyState(vkey);
break;
}
// if the most significant bit is set then the key is down
return ( state & 0x0001 ) != 0;
} }
wxWindow *wxGetActiveWindow() wxWindow *wxGetActiveWindow()