diff options
Diffstat (limited to 'gui/newgui.h')
| -rw-r--r-- | gui/newgui.h | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/gui/newgui.h b/gui/newgui.h index d4143db178..c87b4fd177 100644 --- a/gui/newgui.h +++ b/gui/newgui.h @@ -30,7 +30,7 @@  #include "common/stack.h"  #include "common/str.h"  #include "graphics/fontman.h" -#include "gui/theme.h" +  #include "gui/widget.h"  #include "gui/ThemeEngine.h" @@ -83,10 +83,10 @@ public:  	ThemeEval *xmlEval() { return _theme->getEvaluator(); } -	const Graphics::Font &getFont(Theme::FontStyle style = Theme::kFontStyleBold) const { return *(_theme->getFont(style)); } -	int getFontHeight(Theme::FontStyle style = Theme::kFontStyleBold) const { return _theme->getFontHeight(style); } -	int getStringWidth(const Common::String &str, Theme::FontStyle style = Theme::kFontStyleBold) const { return _theme->getStringWidth(str, style); } -	int getCharWidth(byte c, Theme::FontStyle style = Theme::kFontStyleBold) const { return _theme->getCharWidth(c, style); } +	const Graphics::Font &getFont(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return *(_theme->getFont(style)); } +	int getFontHeight(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getFontHeight(style); } +	int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); } +	int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); }  	WidgetSize getWidgetSize(); | 
