aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-02-05 21:32:43 +0000
committerMartin Kiewitz2010-02-05 21:32:43 +0000
commit9b5363c0e4ea8b37c4c94c1a2fa2e28d23858d1f (patch)
treeed3ba008eb739900297150659f38ee93a6eb01bc /engines/sci
parentf9673182254d2a3ea4bb770ce031d89985c8cba9 (diff)
downloadscummvm-rg350-9b5363c0e4ea8b37c4c94c1a2fa2e28d23858d1f.tar.gz
scummvm-rg350-9b5363c0e4ea8b37c4c94c1a2fa2e28d23858d1f.tar.bz2
scummvm-rg350-9b5363c0e4ea8b37c4c94c1a2fa2e28d23858d1f.zip
SCI: moved control type enum
svn-id: r47915
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/controls.h11
-rw-r--r--engines/sci/graphics/gui.h11
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/sci/graphics/controls.h b/engines/sci/graphics/controls.h
index 8c38b4fc8e..af8972f156 100644
--- a/engines/sci/graphics/controls.h
+++ b/engines/sci/graphics/controls.h
@@ -34,6 +34,17 @@ enum controlStateFlags {
kControlStateFramed = 0x0008 ///< 1000 - widgets surrounded by a frame
};
+// Control types and flags
+enum {
+ SCI_CONTROLS_TYPE_BUTTON = 1,
+ SCI_CONTROLS_TYPE_TEXT = 2,
+ SCI_CONTROLS_TYPE_TEXTEDIT = 3,
+ SCI_CONTROLS_TYPE_ICON = 4,
+ SCI_CONTROLS_TYPE_LIST = 6,
+ SCI_CONTROLS_TYPE_LIST_ALIAS = 7,
+ SCI_CONTROLS_TYPE_DUMMY = 10
+};
+
class GfxPorts;
class GfxPaint16;
class Font;
diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h
index 74735925af..b37c87ac4d 100644
--- a/engines/sci/graphics/gui.h
+++ b/engines/sci/graphics/gui.h
@@ -30,17 +30,6 @@
namespace Sci {
-// Control types and flags
-enum {
- SCI_CONTROLS_TYPE_BUTTON = 1,
- SCI_CONTROLS_TYPE_TEXT = 2,
- SCI_CONTROLS_TYPE_TEXTEDIT = 3,
- SCI_CONTROLS_TYPE_ICON = 4,
- SCI_CONTROLS_TYPE_LIST = 6,
- SCI_CONTROLS_TYPE_LIST_ALIAS = 7,
- SCI_CONTROLS_TYPE_DUMMY = 10
-};
-
class GfxScreen;
class GfxPalette;
class GfxCursor;