[Scummvm-cvs-logs] SF.net SVN: scummvm:[35632] scummvm/trunk/gui
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Dec 31 15:37:23 CET 2008
Revision: 35632
http://scummvm.svn.sourceforge.net/scummvm/?rev=35632&view=rev
Author: thebluegr
Date: 2008-12-31 14:37:22 +0000 (Wed, 31 Dec 2008)
Log Message:
-----------
Removed "const" keyword from kDrawDataDefaults. MSVC complains that "'const' static/global data initialized with compiler generated default constructor fills the object with zeros", in ThemeEngine.h line 123
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:10:23 UTC (rev 35631)
+++ scummvm/trunk/gui/ThemeData.cpp 2008-12-31 14:37:22 UTC (rev 35632)
@@ -40,7 +40,7 @@
/**********************************************************
* Data definitions for theme engine elements
*********************************************************/
-const ThemeEngine::DrawDataInfo ThemeEngine::kDrawDataDefaults[] = {
+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:10:23 UTC (rev 35631)
+++ scummvm/trunk/gui/ThemeEngine.h 2008-12-31 14:37:22 UTC (rev 35632)
@@ -120,7 +120,7 @@
DrawData parent; //!< Parent DrawData item, for items that overlay. E.g. kButtonIdle -> kButtonHover
}
- static const kDrawDataDefaults[];
+ static 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