diff options
| author | Max Horn | 2004-08-11 21:49:58 +0000 |
|---|---|---|
| committer | Max Horn | 2004-08-11 21:49:58 +0000 |
| commit | ee70457667b7480226b3af3bf3047e098a0344c5 (patch) | |
| tree | e05bab6e875610e014a821826c5a1a66a09ff5fe /gui | |
| parent | 39137da10d4c8c18c0c0a6b30351459d1654a6c2 (diff) | |
| download | scummvm-rg350-ee70457667b7480226b3af3bf3047e098a0344c5.tar.gz scummvm-rg350-ee70457667b7480226b3af3bf3047e098a0344c5.tar.bz2 scummvm-rg350-ee70457667b7480226b3af3bf3047e098a0344c5.zip | |
Fix for bug #1007093 (GUI: removing game configuration from Launcher buggy); moral: either document how things work, or at least provide well named constants for certain return values... using the cheap way out here, i.e. method (b) :-)
svn-id: r14557
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/launcher.cpp | 2 | ||||
| -rw-r--r-- | gui/message.cpp | 5 | ||||
| -rw-r--r-- | gui/message.h | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/gui/launcher.cpp b/gui/launcher.cpp index fde75f08b4..37db88cfa4 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -581,7 +581,7 @@ void LauncherDialog::addGame() { void LauncherDialog::removeGame(int item) { MessageDialog alert("Do you really want to remove this game configuration?", "Yes", "No"); - if (alert.runModal() > 0) { + if (alert.runModal() == GUI::kMessageOK) { // Remove the currently selected game from the list assert(item >= 0); ConfMan.removeGameDomain(_domains[item]); diff --git a/gui/message.cpp b/gui/message.cpp index 206f145cdf..95b6ecfaf4 100644 --- a/gui/message.cpp +++ b/gui/message.cpp @@ -142,11 +142,12 @@ int MessageDialog::addLine(StringList &lines, const char *line, int size) { } void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { + // FIXME: It's a really bad thing that we use two arbitrary constants if (cmd == kOkCmd) { - setResult(1); + setResult(kMessageOK); close(); } else if (cmd == kCancelCmd) { - setResult(2); + setResult(kMessageCancel); close(); } else { Dialog::handleCommand(sender, cmd, data); diff --git a/gui/message.h b/gui/message.h index 30a2c6bfa0..328eebf499 100644 --- a/gui/message.h +++ b/gui/message.h @@ -26,6 +26,12 @@ namespace GUI { +enum { + kMessageOK = 1, + kMessageCancel = 0 +}; + + /** * Simple message dialog ("alert box"): presents a text message in a dialog with up to two buttons. */ |