diff options
| author | Filippos Karapetis | 2008-12-31 14:37:22 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-12-31 14:37:22 +0000 |
| commit | 9f0a401047ce570756a9b30ed60038031883437a (patch) | |
| tree | 0a64722c9096443c01920c0da7639107a94c87f1 | |
| parent | be73014f67d053cb5cdfb5279a214e5ce70c4bcf (diff) | |
| download | scummvm-rg350-9f0a401047ce570756a9b30ed60038031883437a.tar.gz scummvm-rg350-9f0a401047ce570756a9b30ed60038031883437a.tar.bz2 scummvm-rg350-9f0a401047ce570756a9b30ed60038031883437a.zip | |
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
svn-id: r35632
| -rw-r--r-- | gui/ThemeData.cpp | 2 | ||||
| -rw-r--r-- | gui/ThemeEngine.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/ThemeData.cpp b/gui/ThemeData.cpp index e05ca7f988..78d47408b8 100644 --- a/gui/ThemeData.cpp +++ b/gui/ThemeData.cpp @@ -40,7 +40,7 @@ namespace GUI { /********************************************************** * 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}, diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index bb0a0e4cf7..afad28c133 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -120,7 +120,7 @@ protected: DrawData parent; //!< Parent DrawData item, for items that overlay. E.g. kButtonIdle -> kButtonHover } - static const kDrawDataDefaults[]; + static kDrawDataDefaults[]; enum TextData { |