From 587a691b122961e44926f0a0ff25590f754940ee Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 31 Dec 2008 14:54:30 +0000 Subject: Proper fix: Readded the const keyword, together with the missing data type in ThemeEngine.h svn-id: r35634 --- gui/ThemeData.cpp | 2 +- gui/ThemeEngine.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/ThemeData.cpp b/gui/ThemeData.cpp index 78d47408b8..e05ca7f988 100644 --- a/gui/ThemeData.cpp +++ b/gui/ThemeData.cpp @@ -40,7 +40,7 @@ namespace GUI { /********************************************************** * 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}, diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index afad28c133..4435848fb3 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -118,9 +118,9 @@ protected: 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 { -- cgit v1.2.3