diff options
| author | David Corrales | 2007-06-23 18:51:33 +0000 |
|---|---|---|
| committer | David Corrales | 2007-06-23 18:51:33 +0000 |
| commit | cacd7a28fd51d960947de88abbf30c487e66529d (patch) | |
| tree | f3baa59853bfb307e452b86b9d93c4737b1fa6ab /gui/PopUpWidget.cpp | |
| parent | 0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff) | |
| parent | 90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff) | |
| download | scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2 scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip | |
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'gui/PopUpWidget.cpp')
| -rw-r--r-- | gui/PopUpWidget.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp index 1bdce8a24e..d40a01c981 100644 --- a/gui/PopUpWidget.cpp +++ b/gui/PopUpWidget.cpp @@ -24,6 +24,7 @@ #include "common/stdafx.h" #include "common/system.h" +#include "common/events.h" #include "gui/dialog.h" #include "gui/eval.h" #include "gui/newgui.h" @@ -210,7 +211,7 @@ void PopUpDialog::handleMouseMoved(int x, int y, int button) { } void PopUpDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { - if (keycode == 27) { // escape + if (keycode == Common::KEYCODE_ESCAPE) { // Don't change the previous selection setResult(-1); close(); @@ -221,21 +222,21 @@ void PopUpDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { return; switch (keycode) { - case '\n': // enter/return - case '\r': + case Common::KEYCODE_RETURN: + case Common::KEYCODE_KP_ENTER: setResult(_selection); close(); break; - case 256+17: // up arrow + case Common::KEYCODE_UP: moveUp(); break; - case 256+18: // down arrow + case Common::KEYCODE_DOWN: moveDown(); break; - case 256+22: // home + case Common::KEYCODE_HOME: setSelection(0); break; - case 256+23: // end + case Common::KEYCODE_END: setSelection(_popUpBoss->_entries.size()-1); break; } |