aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-11-29 10:43:14 +0000
committerMax Horn2010-11-29 10:43:14 +0000
commit1ef8d5e38a7a7b5cf1d0495dbb9cfe85888fb627 (patch)
tree8fa73d4563ee4eaa26bd9d390a5599e127f98c2a
parentfba6ee8af93a1abf98f39e317901f7baf1869300 (diff)
downloadscummvm-rg350-1ef8d5e38a7a7b5cf1d0495dbb9cfe85888fb627.tar.gz
scummvm-rg350-1ef8d5e38a7a7b5cf1d0495dbb9cfe85888fb627.tar.bz2
scummvm-rg350-1ef8d5e38a7a7b5cf1d0495dbb9cfe85888fb627.zip
GP2X: More compilation fixes
svn-id: r54569
-rw-r--r--backends/events/gp2xsdl/gp2xsdl-events.cpp25
-rw-r--r--backends/events/gp2xsdl/gp2xsdl-events.h1
-rw-r--r--backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp3
3 files changed, 6 insertions, 23 deletions
diff --git a/backends/events/gp2xsdl/gp2xsdl-events.cpp b/backends/events/gp2xsdl/gp2xsdl-events.cpp
index c5191dd534..635d818b40 100644
--- a/backends/events/gp2xsdl/gp2xsdl-events.cpp
+++ b/backends/events/gp2xsdl/gp2xsdl-events.cpp
@@ -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 @@ bool GP2XSdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
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;
diff --git a/backends/events/gp2xsdl/gp2xsdl-events.h b/backends/events/gp2xsdl/gp2xsdl-events.h
index 129069e131..8ea533d052 100644
--- a/backends/events/gp2xsdl/gp2xsdl-events.h
+++ b/backends/events/gp2xsdl/gp2xsdl-events.h
@@ -47,7 +47,6 @@ protected:
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);
diff --git a/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp b/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
index 4130baa6ac..2b029a39e5 100644
--- a/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
+++ b/backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
@@ -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>