Merge 1.4.1 r594:595 into trunk

This commit is contained in:
Nick Bolton 2010-06-12 17:40:28 +00:00
parent a8eb2a3bfd
commit b62582444e
4 changed files with 40 additions and 10 deletions

View file

@ -925,12 +925,7 @@ CMSWindowsKeyState::getKeyMap(CKeyMap& keyMap)
// deal with certain virtual keys specially
switch (vk) {
case VK_SHIFT:
if (MapVirtualKey(VK_RSHIFT, 0) == i) {
vk = VK_RSHIFT;
}
else {
vk = VK_LSHIFT;
}
vk = VK_LSHIFT;
break;
case VK_CONTROL: