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

return non-numpad key codes from wxCharCodeMSWToWX() if it is called with lParam==0 (this happens only when it's not called from WM_KEYDOWN/UP/CHAR handler and so we don't have information about which key was really pressed)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-02-15 15:04:04 +00:00
parent b1ac62dda7
commit ed5bc8f1bf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/window.cpp
View File

@ -5202,9 +5202,14 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font)
// use the "extended" bit (24) of lParam to distinguish extended keys // use the "extended" bit (24) of lParam to distinguish extended keys
// from normal keys as the same key is sent // from normal keys as the same key is sent
static inline int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended) static inline
int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended)
{ {
return lParam & (1 << 24) ? keyExtended : keyNormal; // except that if lParam is 0, it means we don't have real lParam 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
// non-numpad (hence extended) key as this is a more common case
return !lParam || (lParam & (1 << 24)) ? keyExtended : keyNormal;
} }
// Returns 0 if was a normal ASCII value, not a special key. This indicates that // Returns 0 if was a normal ASCII value, not a special key. This indicates that
@ -5322,9 +5327,10 @@ int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam)
case VK_DELETE: case VK_DELETE:
id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_DELETE, WXK_DELETE); id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_DELETE, WXK_DELETE);
break; break;
// this order is correct as the numpad enter is the extended key
case VK_RETURN: case VK_RETURN:
id = ChooseNormalOrExtended(lParam, WXK_RETURN, WXK_NUMPAD_ENTER); // don't use ChooseNormalOrExtended() here as the keys are reversed
// here: numpad enter is the extended one
id = lParam && (lParam & (1 << 24)) ? WXK_NUMPAD_ENTER : WXK_RETURN;
break; break;
default: default: