[Scummvm-cvs-logs] SF.net SVN: scummvm: [27680] scummvm/trunk/backends/platform/wince/ wince-sdl.cpp

robinwatts at users.sourceforge.net robinwatts at users.sourceforge.net
Sat Jun 23 19:15:36 CEST 2007


Revision: 27680
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27680&view=rev
Author:   robinwatts
Date:     2007-06-23 10:15:36 -0700 (Sat, 23 Jun 2007)

Log Message:
-----------
Add a couple of casts from int to (Common:KeyCode) in the WinCE specific code.

2 of the 4 casts are lifted from the standard sdl/events.cpp file. The other
2 (casting the results of mapKeyCE before assigning to event.kbd.keycode look
correct to me too, but might bear double checking.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-06-23 17:00:27 UTC (rev 27679)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-06-23 17:15:36 UTC (rev 27680)
@@ -2162,9 +2162,9 @@
 
 			event.type = Common::EVENT_KEYDOWN;
 			if (!_unfilteredkeys)
-				event.kbd.keycode = ev.key.keysym.sym;
+				event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
 			else
-				event.kbd.keycode = mapKeyCE(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode, _unfilteredkeys);
+				event.kbd.keycode = (Common::KeyCode)mapKeyCE(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode, _unfilteredkeys);
 			event.kbd.ascii = mapKeyCE(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode, _unfilteredkeys);
 
 			return true;
@@ -2189,9 +2189,9 @@
 
 			event.type = Common::EVENT_KEYUP;
 			if (!_unfilteredkeys)
-				event.kbd.keycode = ev.key.keysym.sym;
+				event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
 			else
-				event.kbd.keycode = mapKeyCE(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode, _unfilteredkeys);
+				event.kbd.keycode = (Common::KeyCode)mapKeyCE(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode, _unfilteredkeys);
 			event.kbd.ascii = mapKeyCE(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode, _unfilteredkeys);
 
 			return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list