[Scummvm-cvs-logs] SF.net SVN: scummvm:[54569] scummvm/trunk/backends

[fingolfin at users.sourceforge.net]

Revision: 54569
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54569&view=rev
Author:   fingolfin
Date:     2010-11-29 10:43:14 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
GP2X: More compilation fixes

Modified Paths:
--------------
    scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.cpp
    scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.h
    scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp

Modified: scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.cpp
===================================================================
--- scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.cpp	2010-11-29 10:20:45 UTC (rev 54568)
+++ scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.cpp	2010-11-29 10:43:14 UTC (rev 54569)
@@ -25,6 +25,9 @@
 
 #if defined(GP2X) || defined(GP2XWIZ)
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+
 #include "backends/events/gp2xsdl/gp2xsdl-events.h"
 #if defined(GP2X)
 #include "backends/platform/gp2x/gp2x-hw.h"
@@ -200,28 +203,6 @@
 	return true;
 }
 
-bool GP2XSdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
-	if (remapKey(ev, event))
-		return true;
-
-	event.type = Common::EVENT_KEYUP;
-	event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
-	event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
-
-	// Ctrl-Alt-<key> will change the GFX mode
-	SDLModToOSystemKeyFlags(SDL_GetModState(), event);
-
-	// Set the scroll lock sticky flag
-	if (_scrollLock)
-		event.kbd.flags |= Common::KBD_SCRL;
-
-	if (isScalerHotkey(event))
-		// Swallow these key up events
-		return false;
-
-	return true;
-}
-
 bool GP2XSdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
 
 	_stickBtn[ev.jbutton.button] = 1;

Modified: scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.h
===================================================================
--- scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.h	2010-11-29 10:20:45 UTC (rev 54568)
+++ scummvm/trunk/backends/events/gp2xsdl/gp2xsdl-events.h	2010-11-29 10:43:14 UTC (rev 54569)
@@ -47,7 +47,6 @@
 	void moveStick();
 
 	virtual bool handleKeyDown(SDL_Event &ev, Common::Event &event);
-	virtual bool handleKeyUp(SDL_Event &ev, Common::Event &event);
 	virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
 	virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
 	virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);

Modified: scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp	2010-11-29 10:20:45 UTC (rev 54568)
+++ scummvm/trunk/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp	2010-11-29 10:43:14 UTC (rev 54569)
@@ -25,6 +25,9 @@
 
 #ifdef GP2X
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+
 #include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h"
 #include "graphics/scaler/aspect.h"
 #include <SDL_gp2x.h>


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