diff options
| author | Johannes Schickel | 2012-02-13 01:20:02 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-02-13 01:20:02 +0100 |
| commit | d811240a9d38098f5b1f77b7d8dbef7a947f9a67 (patch) | |
| tree | e2c904f96cbfa725bb70f378a82d576386a4db3e /backends/platform/webos | |
| parent | 143363d5b6baef14898ee0f41e3735de2048761a (diff) | |
| download | scummvm-rg350-d811240a9d38098f5b1f77b7d8dbef7a947f9a67.tar.gz scummvm-rg350-d811240a9d38098f5b1f77b7d8dbef7a947f9a67.tar.bz2 scummvm-rg350-d811240a9d38098f5b1f77b7d8dbef7a947f9a67.zip | |
ALL: Enable Keymapper specific OSystem API only when the Keymapper is enabled.
Diffstat (limited to 'backends/platform/webos')
| -rw-r--r-- | backends/platform/webos/webos.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/webos/webos.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/webos/webos.cpp b/backends/platform/webos/webos.cpp index bfb19ed3bc..abf572e6be 100644 --- a/backends/platform/webos/webos.cpp +++ b/backends/platform/webos/webos.cpp @@ -51,8 +51,8 @@ void OSystem_SDL_WebOS::initBackend() { * * @return The hardware key set with added webOS specific keys. */ -HardwareKeySet *OSystem_SDL_WebOS::getHardwareKeySet() { #ifdef ENABLE_KEYMAPPER +HardwareKeySet *OSystem_SDL_WebOS::getHardwareKeySet() { // Get the original SDL hardware key set HardwareKeySet *keySet = OSystem_SDL::getHardwareKeySet(); @@ -62,9 +62,7 @@ HardwareKeySet *OSystem_SDL_WebOS::getHardwareKeySet() { // Return the modified hardware key set return keySet; -#else - return 0; -#endif } +#endif #endif diff --git a/backends/platform/webos/webos.h b/backends/platform/webos/webos.h index 850aaf9ce2..71390a1d2c 100644 --- a/backends/platform/webos/webos.h +++ b/backends/platform/webos/webos.h @@ -31,7 +31,9 @@ public: OSystem_SDL_WebOS(); virtual void initBackend(); +#ifdef ENABLE_KEYMAPPER virtual Common::HardwareKeySet *getHardwareKeySet(); +#endif }; #endif |