[Scummvm-cvs-logs] scummvm master -> a6efdf642238e0f54bedeb8cd0dfef6a93eb838e

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a6efdf6422 SDL: Disable keycode remapping when building for WinCE


Commit: a6efdf642238e0f54bedeb8cd0dfef6a93eb838e
    https://github.com/scummvm/scummvm/commit/a6efdf642238e0f54bedeb8cd0dfef6a93eb838e
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-07-25T23:09:32+02:00

Commit Message:
SDL: Disable keycode remapping when building for WinCE

WinCE does not have MapVirtualKey.

Changed paths:
    backends/events/sdl/sdl-events.cpp



diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index c7c717e..acc1ff5 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -872,7 +872,7 @@ bool SdlEventSource::handleResizeEvent(Common::Event &event, int w, int h) {
 }
 
 SDLKey SdlEventSource::obtainKeycode(const SDL_keysym keySym) {
-#if !SDL_VERSION_ATLEAST(2, 0, 0) && defined(WIN32)
+#if !SDL_VERSION_ATLEAST(2, 0, 0) && defined(WIN32) && !defined(_WIN32_WCE)
 	// WORKAROUND: SDL 1.2 on Windows does not use the user configured keyboard layout,
 	// resulting in "keySym.sym" values to always be those expected for an US keyboard.
 	// For example, SDL returns SDLK_Q when pressing the 'A' key on an AZERTY keyboard.
@@ -885,7 +885,7 @@ SDLKey SdlEventSource::obtainKeycode(const SDL_keysym keySym) {
 		// The keycode returned by SDL is kept for the number keys.
 		// Querying the keyboard layout for those would return the base key values
 		// for AZERTY keyboards, which are not numbers. For example, SDLK_1 would
-		// map to SDLK_AMPERSAND. This is theoratically correct but practically unhelpful,
+		// map to SDLK_AMPERSAND. This is theoretically correct but practically unhelpful,
 		// because it makes it impossible to handle key combinations such as "ctrl-1".
 		return keySym.sym;
 	}