diff options
| author | Vicent Marti | 2008-07-02 18:43:17 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-07-02 18:43:17 +0000 |
| commit | 2d87b29058ef84f482550fc0f002d9805fc53b87 (patch) | |
| tree | 8c0d7b5495201e7e8435e1068f5587845850930b | |
| parent | d385c34dd0c52ccc4c7fff50e88361dbb2cd588d (diff) | |
| download | scummvm-rg350-2d87b29058ef84f482550fc0f002d9805fc53b87.tar.gz scummvm-rg350-2d87b29058ef84f482550fc0f002d9805fc53b87.tar.bz2 scummvm-rg350-2d87b29058ef84f482550fc0f002d9805fc53b87.zip | |
GCC compiling fixes.
svn-id: r32877
| -rw-r--r-- | gui/ThemeParser.h | 1 | ||||
| -rw-r--r-- | gui/ThemeRenderer.h | 1 | ||||
| -rw-r--r-- | gui/dialog.h | 1 | ||||
| -rw-r--r-- | gui/module.mk | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h index 56d45eb802..d3a9503b8d 100644 --- a/gui/ThemeParser.h +++ b/gui/ThemeParser.h @@ -313,7 +313,6 @@ class ThemeRenderer; class ThemeParser : public XMLParser { typedef void (VectorRenderer::*DrawingFunctionCallback)(const Common::Rect &, const DrawStep &); typedef bool (ThemeParser::*ParserCallback)(); - typedef GUI::InterfaceManager InterfaceManager; public: ThemeParser(GUI::ThemeRenderer *parent); diff --git a/gui/ThemeRenderer.h b/gui/ThemeRenderer.h index e9904d8ae3..af89bd6732 100644 --- a/gui/ThemeRenderer.h +++ b/gui/ThemeRenderer.h @@ -40,7 +40,6 @@ namespace GUI { struct WidgetDrawData; -class InterfaceManager; struct WidgetDrawData { Common::Array<Graphics::DrawStep*> _steps; diff --git a/gui/dialog.h b/gui/dialog.h index f34e9d2e0d..553a63d1a9 100644 --- a/gui/dialog.h +++ b/gui/dialog.h @@ -44,7 +44,6 @@ enum { class Dialog : public GuiObject { // TANOKU-TODO: remove newgui from here friend class NewGui; - friend class InterfaceManager; protected: Widget *_mouseWidget; Widget *_focusedWidget; diff --git a/gui/module.mk b/gui/module.mk index 81be839777..6ff74641b8 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -10,7 +10,7 @@ MODULE_OBJS := \ editable.o \ EditTextWidget.o \ eval.o \ - InterfaceManager.o \ + ThemeRenderer.o \ launcher.o \ ListWidget.o \ massadd.o \ |