aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2010-04-06 09:26:43 +0000
committerMax Horn2010-04-06 09:26:43 +0000
commit894e2aefe6042cea38b93439812193f8ceb8356b (patch)
tree7295f1cba5168928151bbee324cb5db1ab772ae1 /gui
parent745edbadc7b3841556c2e8962725bfd3de8a4dd3 (diff)
downloadscummvm-rg350-894e2aefe6042cea38b93439812193f8ceb8356b.tar.gz
scummvm-rg350-894e2aefe6042cea38b93439812193f8ceb8356b.tar.bz2
scummvm-rg350-894e2aefe6042cea38b93439812193f8ceb8356b.zip
GUI: Unify various definitions of kOKCmd and move it to namespace GUI
svn-id: r48564
Diffstat (limited to 'gui')
-rw-r--r--gui/KeysDialog.cpp3
-rw-r--r--gui/dialog.h3
-rw-r--r--gui/options.h4
3 files changed, 3 insertions, 7 deletions
diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp
index 103ae918ef..b80dd200bb 100644
--- a/gui/KeysDialog.cpp
+++ b/gui/KeysDialog.cpp
@@ -34,8 +34,7 @@
namespace GUI {
enum {
- kMapCmd = 'map ',
- kOKCmd = 'ok '
+ kMapCmd = 'map '
};
KeysDialog::KeysDialog(const Common::String &title)
diff --git a/gui/dialog.h b/gui/dialog.h
index dcc7d6fe27..5008f272ba 100644
--- a/gui/dialog.h
+++ b/gui/dialog.h
@@ -38,7 +38,8 @@ class PopUpWidget;
// Some "common" commands sent to handleCommand()
enum {
- kCloseCmd = 'clos'
+ kCloseCmd = 'clos',
+ kOKCmd = 'ok '
};
class Dialog : public GuiObject {
diff --git a/gui/options.h b/gui/options.h
index 13803aee77..fa1f4dfb02 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -57,10 +57,6 @@ public:
virtual void reflowLayout();
- enum {
- kOKCmd = 'ok '
- };
-
protected:
/** Config domain this dialog is used to edit. */
String _domain;