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

applying patch 1789066

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-09-18 17:31:06 +00:00
parent 71b31f9983
commit cdb36045cd
1 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/mac/carbon/app.cpp
View File

@@ -1660,41 +1660,55 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
{ {
keyval = (keyval - '0') + WXK_NUMPAD0; keyval = (keyval - '0') + WXK_NUMPAD0;
} }
else if (keycode >= 67 && keycode <= 81) else
{ {
switch (keycode) switch (keycode)
{ {
case 76 : case 76 :
keyval = WXK_NUMPAD_ENTER; keyval = WXK_NUMPAD_ENTER;
break; break;
case 81: case 81:
keyval = WXK_NUMPAD_EQUAL; keyval = WXK_NUMPAD_EQUAL;
break; break;
case 67: case 67:
keyval = WXK_NUMPAD_MULTIPLY; keyval = WXK_NUMPAD_MULTIPLY;
break; break;
case 75: case 75:
keyval = WXK_NUMPAD_DIVIDE; keyval = WXK_NUMPAD_DIVIDE;
break; break;
case 78: case 78:
keyval = WXK_NUMPAD_SUBTRACT; keyval = WXK_NUMPAD_SUBTRACT;
break; break;
case 69: case 69:
keyval = WXK_NUMPAD_ADD; keyval = WXK_NUMPAD_ADD;
break; break;
case 65: case 65:
keyval = WXK_NUMPAD_DECIMAL; keyval = WXK_NUMPAD_DECIMAL;
break; break;
case 24: // + key
default: keyval = WXK_ADD;
break; break;
} // end switch case 27: // - key
keyval = WXK_SUBTRACT;
break;
case 28: // * key
keyval = WXK_MULTIPLY;
break;
case 44: // / key
keyval = WXK_DIVIDE;
break;
case 47: //. key
keyval = WXK_DECIMAL;
break;
default:
break;
}
} }
event.m_shiftDown = modifiers & shiftKey; event.m_shiftDown = modifiers & shiftKey;