[Orxonox-commit 1653] r6371 - code/branches/presentation2/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-17 16:39:34 +0100 (Thu, 17 Dec 2009)
New Revision: 6371

Modified:
   code/branches/presentation2/src/libraries/core/CMakeLists.txt
   code/branches/presentation2/src/libraries/core/GUIManager.h
Log:
Added tolua interface to GUIManager again. Found out it didn't have one anymore ^^

Modified: code/branches/presentation2/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/presentation2/src/libraries/core/CMakeLists.txt	2009-12-17 10:10:39 UTC (rev 6370)
+++ code/branches/presentation2/src/libraries/core/CMakeLists.txt	2009-12-17 15:39:34 UTC (rev 6371)
@@ -88,6 +88,7 @@
     ConfigFileManager.h
     Game.h
     GameMode.h
+    GUIManager.h
     Loader.h
     LuaState.h
     PathConfig.h

Modified: code/branches/presentation2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/presentation2/src/libraries/core/GUIManager.h	2009-12-17 10:10:39 UTC (rev 6370)
+++ code/branches/presentation2/src/libraries/core/GUIManager.h	2009-12-17 15:39:34 UTC (rev 6371)
@@ -43,8 +43,8 @@
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
 
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
     class PlayerInfo; // Forward declaration
 
     /**
@@ -58,8 +58,9 @@
         Since the GUI needs user input, the GUIManager implements the functions needed to act as a key and/or mouse handler.
         Those input events are then injected into CEGUI in Lua.
     */
-    class _CoreExport GUIManager : public Singleton<GUIManager>, public InputHandler
-    {
+    class _CoreExport GUIManager // tolua_export
+        : public Singleton<GUIManager>, public InputHandler
+    { // tolua_export
         friend class Singleton<GUIManager>;
     public:
         GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen);
@@ -115,7 +116,7 @@
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager
         bool                                 bShowIngameGUI_;
 
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _GUIManager_H__ */