diff options
| author | Lars Persson | 2005-07-05 20:22:56 +0000 |
|---|---|---|
| committer | Lars Persson | 2005-07-05 20:22:56 +0000 |
| commit | d4716a1fb525540f3395262d236df51ef70874f1 (patch) | |
| tree | 7e5ddbbd1b7cfb28df2c25f041bf07d487bed662 /scumm | |
| parent | 57858a8757a5b3d96958ec856862886184082652 (diff) | |
| download | scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.gz scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.tar.bz2 scummvm-rg350-d4716a1fb525540f3395262d236df51ef70874f1.zip | |
* Start of generic key configuration support for ScummVM
* Moved KeyConfigDialog, key from WinCE to gui
* Updated wince code to inherit and use new GUI::Keys and launch new dialog
* New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp
* Added new function to SDL\Events that handles key remapping. LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events
* Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA)
* Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test
* Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly
* Actor.h in Saga now compiles for default VC6 setting.
* Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting.
* Changed order of creation of gamedetector and mainsystem in Main.cpp
* If anything does not compile, or is totally out of order, please revert changes.
svn-id: r18498
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/dialogs.cpp | 14 | ||||
| -rw-r--r-- | scumm/dialogs.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index aeef1ec376..9125e5324b 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -43,8 +43,8 @@ #include "scumm/help.h" #endif -#ifdef _WIN32_WCE -#include "backends/wince/CEKeysDialog.h" +#ifdef SMALL_SCREEN_DEVICE +#include "KeysDialog.h" #endif using GUI::CommandSender; @@ -590,7 +590,7 @@ ConfigDialog::ConfigDialog(ScummEngine *scumm) addButton(this, _w - (buttonWidth + 4) - 4, yoffset, "OK", GUI::OptionsDialog::kOKCmd, 'O', ws); addButton(this, _w - 2 * (buttonWidth + 4) - 4, yoffset, "Cancel", kCloseCmd, 'C', ws); -#ifdef _WIN32_WCE +#ifdef SMALL_SCREEN_DEVICE addButton(this, _w - 3 * (buttonWidth + 4) - 4, yoffset, "Keys", kKeysCmd, 'K', ws); #endif @@ -601,17 +601,17 @@ ConfigDialog::ConfigDialog(ScummEngine *scumm) _x = (screenW - _w) / 2; _y = (screenH - _h) / 2; -#ifdef _WIN32_WCE +#ifdef SMALL_SCREEN_DEVICE // // Create the sub dialog(s) // - _keysDialog = new CEKeysDialog(); + _keysDialog = new GUI::KeysDialog(); #endif } ConfigDialog::~ConfigDialog() { -#ifdef _WIN32_WCE +#ifdef SMALL_SCREEN_DEVICE delete _keysDialog; #endif } @@ -647,7 +647,7 @@ void ConfigDialog::close() { void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { switch (cmd) { case kKeysCmd: -#ifdef _WIN32_WCE +#ifdef SMALL_SCREEN_DEVICE _keysDialog->runModal(); #endif break; diff --git a/scumm/dialogs.h b/scumm/dialogs.h index c390fa9abe..2a16a748cf 100644 --- a/scumm/dialogs.h +++ b/scumm/dialogs.h @@ -113,7 +113,7 @@ protected: class ConfigDialog : public GUI::OptionsDialog { protected: ScummEngine *_vm; -#ifdef _WIN32_WCE +#ifdef SMALL_SCREEN_DEVICE GUI::Dialog *_keysDialog; #endif |