diff options
| author | Max Horn | 2007-06-30 12:26:59 +0000 |
|---|---|---|
| committer | Max Horn | 2007-06-30 12:26:59 +0000 |
| commit | 2243197f502c06076f493151429e3188b9c2a760 (patch) | |
| tree | e80f331d5cdd944cec632a74dd081a166858b093 /gui/KeysDialog.cpp | |
| parent | 9720742722bc61bb3cb0c8240417816855ea4ef7 (diff) | |
| download | scummvm-rg350-2243197f502c06076f493151429e3188b9c2a760.tar.gz scummvm-rg350-2243197f502c06076f493151429e3188b9c2a760.tar.bz2 scummvm-rg350-2243197f502c06076f493151429e3188b9c2a760.zip | |
Changed GUI system to use Common::KeyState state
svn-id: r27786
Diffstat (limited to 'gui/KeysDialog.cpp')
| -rw-r--r-- | gui/KeysDialog.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp index 33d09e4e69..9586950669 100644 --- a/gui/KeysDialog.cpp +++ b/gui/KeysDialog.cpp @@ -126,23 +126,23 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { } } -void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers){ +void KeysDialog::handleKeyDown(Common::KeyState state){ if (!Actions::Instance()->mappingActive()) - Dialog::handleKeyDown(ascii,keycode,modifiers); + Dialog::handleKeyDown(state); } -void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) { +void KeysDialog::handleKeyUp(Common::KeyState state) { #ifdef __SYMBIAN32__ if (Actions::Instance()->mappingActive()) { #else - if (modifiers == 0xff && Actions::Instance()->mappingActive()) { // GAPI key was selected + if (state.flags == 0xff && Actions::Instance()->mappingActive()) { // GAPI key was selected #endif char selection[100]; - Actions::Instance()->setMapping((ActionType)_actionSelected, ascii); + Actions::Instance()->setMapping((ActionType)_actionSelected, state.ascii); if (ascii != 0) - sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) keycode)); + sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) state.keycode)); else sprintf(selection, "Associated key : none"); @@ -154,7 +154,7 @@ void KeysDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) { _actionsList->setEnabled(true); Actions::Instance()->beginMapping(false); } else - Dialog::handleKeyUp(ascii,keycode,modifiers); + Dialog::handleKeyUp(state); } } // namespace GUI |