Merge pull request #219 from CIB/cleanup

Fixes shift on windows, issue #85

Core/Contents/Source/PolyWinCore.cpp

@@ -476,13 +476,22 @@ PolyKEY Win32Core::mapKey(LPARAM lParam, WPARAM wParam) {
 						wParam = VK_RCONTROL;
 					else
 						wParam = VK_LCONTROL;
-				break;
+					break;
 				case 33:
 					if ( lParam&EXTENDED_KEYMASK )
 						wParam = VK_RMENU;
 					else
 						wParam = VK_LMENU;
 					break;
+				case VK_SHIFT:
+					// We can't tell if it's LSHIFT or RSHIFT,
+					// so use GetKeyState to tell which it is.
+					if( GetKeyState(VK_LSHIFT) ) {
+						wParam = VK_LSHIFT;
+					} else {
+						wParam = VK_RSHIFT;
+					}
+					break;
 			}
 
 	return keyMap[(unsigned int)wParam];