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

No real changes, just use KF_EXTENDED instead of hard-coded bit mask.

Browse Source 
KF_EXTENDED is defined in Windows headers as the mask for extracting the
"extended" bit from LPARAM of the keyboard messages. Use it instead of
explicitly writing less clear "1 << 24".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-09-11 10:18:35 +00:00
parent 042ddf5def
commit e6cef55ae1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/window.cpp
View File

@@ -6023,8 +6023,8 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font)
namespace namespace
{ {
// use the "extended" bit (24) of lParam to distinguish extended keys // use the "extended" bit of lParam to distinguish extended keys from normal
// from normal keys as the same key is sent // keys as the same virtual key code is sent for both by Windows
inline inline
int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended) int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended)
{ {
@@ -6032,7 +6032,7 @@ int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended)
// WM_KEYDOWN but are just translating just a VK constant (e.g. done from // WM_KEYDOWN but are just translating just a VK constant (e.g. done from
// msw/treectrl.cpp when processing TVN_KEYDOWN) -- then assume this is a // msw/treectrl.cpp when processing TVN_KEYDOWN) -- then assume this is a
// non-numpad (hence extended) key as this is a more common case // non-numpad (hence extended) key as this is a more common case
return !lParam || (lParam & (1 << 24)) ? keyExtended : keyNormal; return !lParam || (HIWORD(lParam) & KF_EXTENDED) ? keyExtended : keyNormal;
} }
// this array contains the Windows virtual key codes which map one to one to // this array contains the Windows virtual key codes which map one to one to
@@ -6189,7 +6189,7 @@ int wxCharCodeMSWToWX(int vk, WXLPARAM lParam)
case VK_RETURN: case VK_RETURN:
// don't use ChooseNormalOrExtended() here as the keys are reversed // don't use ChooseNormalOrExtended() here as the keys are reversed
// here: numpad enter is the extended one // here: numpad enter is the extended one
wxk = lParam && (lParam & (1 << 24)) ? WXK_NUMPAD_ENTER : WXK_RETURN; wxk = HIWORD(lParam) & KF_EXTENDED ? WXK_NUMPAD_ENTER : WXK_RETURN;
break; break;
default: default: