[Scummvm-cvs-logs] SF.net SVN: scummvm:[47915] scummvm/trunk/engines/sci/graphics

[m_kiewitz at users.sourceforge.net]

Revision: 47915
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47915&view=rev
Author:   m_kiewitz
Date:     2010-02-05 21:32:43 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
SCI: moved control type enum

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/controls.h
    scummvm/trunk/engines/sci/graphics/gui.h

Modified: scummvm/trunk/engines/sci/graphics/controls.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/controls.h	2010-02-05 21:09:36 UTC (rev 47914)
+++ scummvm/trunk/engines/sci/graphics/controls.h	2010-02-05 21:32:43 UTC (rev 47915)
@@ -34,6 +34,17 @@
 	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;

Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h	2010-02-05 21:09:36 UTC (rev 47914)
+++ scummvm/trunk/engines/sci/graphics/gui.h	2010-02-05 21:32:43 UTC (rev 47915)
@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.