aboutsummaryrefslogtreecommitdiff
path: root/backends/events
diff options
context:
space:
mode:
authorMax Horn2010-11-28 18:09:43 +0000
committerMax Horn2010-11-28 18:09:43 +0000
commit1c3ba8bc405b1f249a488480e397a984834744d4 (patch)
treefcf5402f69dbe804de5312dd6fe2899ee1a0f0e1 /backends/events
parentbeed05b0affcab40d4b54576bd264c8be799c2b6 (diff)
downloadscummvm-rg350-1c3ba8bc405b1f249a488480e397a984834744d4.tar.gz
scummvm-rg350-1c3ba8bc405b1f249a488480e397a984834744d4.tar.bz2
scummvm-rg350-1c3ba8bc405b1f249a488480e397a984834744d4.zip
LINUXMOTO: More compilation fixes
svn-id: r54540
Diffstat (limited to 'backends/events')
-rw-r--r--backends/events/linuxmotosdl/linuxmotosdl-events.cpp13
-rw-r--r--backends/events/linuxmotosdl/linuxmotosdl-events.h5
2 files changed, 6 insertions, 12 deletions
diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
index abd8ad2da8..5e570f99dd 100644
--- a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
+++ b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
@@ -25,6 +25,9 @@
#if defined(LINUXMOTO)
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+
#include "backends/events/linuxmotosdl/linuxmotosdl-events.h"
#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
@@ -32,13 +35,7 @@ enum {
GFX_HALF = 12
};
-LinuxmotoSdlEventManager::LinuxmotoSdlEventManager(Common::EventSource *boss)
- :
- SdlEventManager(boss) {
-
-}
-
-void LinuxmotoSdlEventManager::preprocessEvents(SDL_Event *event) {
+void LinuxmotoSdlEventSource::preprocessEvents(SDL_Event *event) {
if (event->type == SDL_ACTIVEEVENT) {
if (event->active.state == SDL_APPINPUTFOCUS && !event->active.gain) {
((OSystem_SDL* )g_system)->getMixerManager()->suspendAudio();
@@ -60,7 +57,7 @@ void LinuxmotoSdlEventManager::preprocessEvents(SDL_Event *event) {
}
}
-bool LinuxmotoSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) {
+bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
if (false) {}
// Motorol A1200/E6/A1600 remapkey by Lubomyr
diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.h b/backends/events/linuxmotosdl/linuxmotosdl-events.h
index 414db080ed..3b59f09245 100644
--- a/backends/events/linuxmotosdl/linuxmotosdl-events.h
+++ b/backends/events/linuxmotosdl/linuxmotosdl-events.h
@@ -31,10 +31,7 @@
/**
* SDL events manager for LINUXMOTO
*/
-class LinuxmotoSdlEventManager : public SdlEventManager {
-public:
- LinuxmotoSdlEventManager(Common::EventSource *boss);
-
+class LinuxmotoSdlEventSource : public SdlEventSource {
protected:
virtual void preprocessEvents(SDL_Event *event);
virtual bool remapKey(SDL_Event &ev, Common::Event &event);