[Scummvm-cvs-logs] SF.net SVN: scummvm: [32877] scummvm/branches/gsoc2008-gui/gui

[Tanoku at users.sourceforge.net]

Revision: 32877
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32877&view=rev
Author:   Tanoku
Date:     2008-07-02 11:43:17 -0700 (Wed, 02 Jul 2008)

Log Message:
-----------
GCC compiling fixes.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeParser.h
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
    scummvm/branches/gsoc2008-gui/gui/dialog.h
    scummvm/branches/gsoc2008-gui/gui/module.mk

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeParser.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeParser.h	2008-07-02 18:11:41 UTC (rev 32876)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeParser.h	2008-07-02 18:43:17 UTC (rev 32877)
@@ -313,7 +313,6 @@
 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);

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-07-02 18:11:41 UTC (rev 32876)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-07-02 18:43:17 UTC (rev 32877)
@@ -40,7 +40,6 @@
 namespace GUI {
 
 struct WidgetDrawData;
-class InterfaceManager;
 
 struct WidgetDrawData {
 	Common::Array<Graphics::DrawStep*> _steps;

Modified: scummvm/branches/gsoc2008-gui/gui/dialog.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/dialog.h	2008-07-02 18:11:41 UTC (rev 32876)
+++ scummvm/branches/gsoc2008-gui/gui/dialog.h	2008-07-02 18:43:17 UTC (rev 32877)
@@ -44,7 +44,6 @@
 class Dialog : public GuiObject {
 	// TANOKU-TODO: remove newgui from here
 	friend class NewGui;
-	friend class InterfaceManager;
 protected:
 	Widget	*_mouseWidget;
 	Widget  *_focusedWidget;

Modified: scummvm/branches/gsoc2008-gui/gui/module.mk
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/module.mk	2008-07-02 18:11:41 UTC (rev 32876)
+++ scummvm/branches/gsoc2008-gui/gui/module.mk	2008-07-02 18:43:17 UTC (rev 32877)
@@ -10,7 +10,7 @@
 	editable.o \
 	EditTextWidget.o \
 	eval.o \
-	InterfaceManager.o \
+	ThemeRenderer.o \
 	launcher.o \
 	ListWidget.o \
 	massadd.o \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.