diff options
author | Max Horn | 2007-06-22 21:38:34 +0000 |
---|---|---|
committer | Max Horn | 2007-06-22 21:38:34 +0000 |
commit | d21b8c43d05b99ac5ad6b340fabbe2a52b49e533 (patch) | |
tree | 11b5e66db32c61f8174ca19e5e324a045a0f894a | |
parent | c9030e4653d8dd3a96724681a6423f1b1b296d4d (diff) | |
download | scummvm-rg350-d21b8c43d05b99ac5ad6b340fabbe2a52b49e533.tar.gz scummvm-rg350-d21b8c43d05b99ac5ad6b340fabbe2a52b49e533.tar.bz2 scummvm-rg350-d21b8c43d05b99ac5ad6b340fabbe2a52b49e533.zip |
Converted some more code to make use of Common::KEYCODE_ / Common::ASCII_
svn-id: r27628
-rw-r--r-- | engines/queen/journal.cpp | 4 | ||||
-rw-r--r-- | gui/massadd.cpp | 4 | ||||
-rw-r--r-- | gui/message.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 18674db4a3..c75b03a5c0 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -522,8 +522,8 @@ void Journal::updateTextField(uint16 ascii, int keycode) { dirty = true; } break; - case '\n': - case '\r': + case Common::KEYCODE_RETURN: + case Common::KEYCODE_KP_ENTER: if (_textField.text[0]) { closeTextField(); int currentSlot = _currentSavePage * 10 + _currentSaveSlot; diff --git a/gui/massadd.cpp b/gui/massadd.cpp index 06b09a590f..1fc34dfd35 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -85,10 +85,10 @@ MassAddDialog::MassAddDialog(const FilesystemNode &startDir) _gameProgressText = new StaticTextWidget(this, "massadddialog_gameprogress", "... progress ..."); - _okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, '\r'); + _okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, Common::ASCII_RETURN); _okButton->setEnabled(false); - new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, '\27'); + new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE); } diff --git a/gui/message.cpp b/gui/message.cpp index a2de81d1e3..01e30c26a3 100644 --- a/gui/message.cpp +++ b/gui/message.cpp @@ -96,10 +96,10 @@ MessageDialog::MessageDialog(const Common::String &message, const char *defaultB } if (defaultButton) - addButton(this, okButtonPos, _h - buttonHeight - 8, defaultButton, kOkCmd, '\r'); // Confirm dialog + addButton(this, okButtonPos, _h - buttonHeight - 8, defaultButton, kOkCmd, Common::ASCII_RETURN); // Confirm dialog if (altButton) - addButton(this, cancelButtonPos, _h - buttonHeight - 8, altButton, kCancelCmd, '\27'); // Cancel dialog + addButton(this, cancelButtonPos, _h - buttonHeight - 8, altButton, kCancelCmd, Common::ASCII_ESCAPE); // Cancel dialog } void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { |