Mercurial > fife-parpg

diff engine/core/controller/engine.h @ 697:ecaa4d98f05f tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Abstracted the GUI code and refactored the GUIChan-specific code into its own module. * Most of the GUIChan code has been refactored into its own gui/guichan module. However, references to the GuiFont class still persist in the Engine and GuiManager code and these will need further refactoring. * GuiManager is now an abstract base class which specific implementations (e.g. GUIChan) should subclass. * The GUIChan GUI code is now a concrete implementation of GuiManager, most of which is in the new GuiChanGuiManager class. * The GUI code in the Console class has been refactored out of the Console and into the GUIChan module as its own GuiChanConsoleWidget class. The rest of the Console class related to executing commands was left largely unchanged. * Existing client code may need to downcast the GuiManager pointer received from FIFE::Engine::getGuiManager() to GuiChanGuiManager, since not all functionality is represented in the GuiManager abstract base class. Python client code can use the new GuiChanGuiManager.castTo static method for this purpose.
author M. George Hansen <technopolitica@gmail.com>
date Sat, 18 Jun 2011 00:28:40 -1000
parents ca1fcb96907d
children
line wrap: on
line diff
--- a/engine/core/controller/engine.h	Fri Jun 10 23:37:46 2011 -1000
+++ b/engine/core/controller/engine.h	Sat Jun 18 00:28:40 2011 -1000
@@ -52,7 +52,7 @@
 
 	class SoundManager;
 	class RenderBackend;
-	class GUIManager;
+	class GuiManager;
 	class VFS;
 	class VFSSourceFactory;
 	class EventManager;
@@ -66,7 +66,8 @@
 	class SoundClipPool;
 	class RendererBase;
 	class Image;
-
+	class FontManager;
+	class GuiManager;
 
 	class IEngineChangeListener {
 	public:
@@ -158,7 +159,7 @@
 
 		/** Provides access point to the GuiManager
 		 */
-		GUIManager* getGuiManager() const { return m_guimanager; }
+		GuiManager* getGuiManager() const { return m_guimanager; }
 
 		/** Provides access point to the ImagePool
 		 */
@@ -210,7 +211,7 @@
 		void preInit();
 
 		RenderBackend* m_renderbackend;
-		GUIManager* m_guimanager;
+		GuiManager* m_guimanager;
 		EventManager* m_eventmanager;
 		SoundManager* m_soundmanager;
 		TimeManager* m_timemanager;
@@ -219,7 +220,6 @@
 		SoundClipPool* m_soundclippool;
 		VFS* m_vfs;
 		Model* m_model;
-		gcn::Graphics* m_gui_graphics;
 		LogManager* m_logmanager;
 		GuiFont* m_defaultfont;
 		Cursor* m_cursor;