[Scummvm-cvs-logs] SF.net SVN: scummvm:[35634] scummvm/trunk/gui

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Dec 31 15:54:30 CET 2008


Revision: 35634
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35634&view=rev
Author:   thebluegr
Date:     2008-12-31 14:54:30 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
Proper fix: Readded the const keyword, together with the missing data type in ThemeEngine.h

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeData.cpp
    scummvm/trunk/gui/ThemeEngine.h

Modified: scummvm/trunk/gui/ThemeData.cpp
===================================================================
--- scummvm/trunk/gui/ThemeData.cpp	2008-12-31 14:49:53 UTC (rev 35633)
+++ scummvm/trunk/gui/ThemeData.cpp	2008-12-31 14:54:30 UTC (rev 35634)
@@ -40,7 +40,7 @@
 /**********************************************************
  *	Data definitions for theme engine elements
  *********************************************************/
-ThemeEngine::DrawDataInfo ThemeEngine::kDrawDataDefaults[] = {
+const ThemeEngine::DrawDataInfo ThemeEngine::kDrawDataDefaults[] = {
 	{kDDMainDialogBackground,		"mainmenu_bg",		true,	kDDNone},
 	{kDDSpecialColorBackground,		"special_bg",		true,	kDDNone},
 	{kDDPlainColorBackground,		"plain_bg",			true,	kDDNone},

Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h	2008-12-31 14:49:53 UTC (rev 35633)
+++ scummvm/trunk/gui/ThemeEngine.h	2008-12-31 14:54:30 UTC (rev 35634)
@@ -118,9 +118,9 @@
 		const char *name;	//!< The name of the DrawData item as it appears in the Theme Description files
 		bool buffer;		//!< Sets whether this item is buffered on the backbuffer or drawn directly to the screen.
 		DrawData parent;	//!< Parent DrawData item, for items that overlay. E.g. kButtonIdle -> kButtonHover
-	}
+	};
 	
-	static kDrawDataDefaults[];
+	static const DrawDataInfo kDrawDataDefaults[];
 
 
 	enum TextData {


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




More information about the Scummvm-git-logs mailing list