diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/Actions.cpp | 14 | ||||
-rw-r--r-- | gui/KeysDialog.cpp | 8 |
2 files changed, 2 insertions, 20 deletions
diff --git a/gui/Actions.cpp b/gui/Actions.cpp index b25f75e4af..0c4aa6ba75 100644 --- a/gui/Actions.cpp +++ b/gui/Actions.cpp @@ -24,11 +24,7 @@ #include "gui/message.h" #include "common/config-manager.h" -#ifdef _WIN32_WCE - #include "backends/platform/wince/CEActionsPocket.h" - #include "backends/platform/wince/CEActionsSmartphone.h" - #include "backends/platform/wince/CEDevice.h" -#elif defined(__SYMBIAN32__) +#ifdef __SYMBIAN32__ #include "backends/platform/symbian/src/SymbianActions.h" #endif @@ -48,13 +44,7 @@ Actions::~Actions() { // call the correct object creator function according to the Factory Pattern void Actions::init() { -#ifdef _WIN32_WCE - // For WinCE: now use software + Factory pattern to create correct objects - if (!CEDevice::isSmartphone()) - CEActionsPocket::init(); - else - CEActionsSmartphone::init(); -#elif defined(__SYMBIAN32__) +#if defined(__SYMBIAN32__) SymbianActions::init(); #endif } diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp index 68e9bd836d..22d8cb42a8 100644 --- a/gui/KeysDialog.cpp +++ b/gui/KeysDialog.cpp @@ -25,10 +25,6 @@ #include "common/translation.h" #include <SDL_keyboard.h> -#ifdef _WIN32_WCE -#include "CEDevice.h" -#endif - namespace GUI { enum { @@ -128,11 +124,7 @@ void KeysDialog::handleKeyDown(Common::KeyState state){ } void KeysDialog::handleKeyUp(Common::KeyState state) { -#ifdef __SYMBIAN32__ if (Actions::Instance()->mappingActive()) { -#else - if (state.flags == 0xff && Actions::Instance()->mappingActive()) { // GAPI key was selected -#endif Common::String selection; Actions::Instance()->setMapping((ActionType)_actionSelected, state.ascii); |