Changeset 6371 for code/branches

Timestamp:

Dec 17, 2009, 4:39:34 PM (15 years ago)

Author:

rgrieder

Message:

Added tolua interface to GUIManager again. Found out it didn't have one anymore

Location:

code/branches/presentation2/src/libraries/core

Files:

• CMakeLists.txt (modified) (1 diff)
• GUIManager.h (modified) (3 diffs)

code/branches/presentation2/src/libraries/core/CMakeLists.txt

@@ -89 +89 @@
     Game.h
     GameMode.h
+    GUIManager.h
     Loader.h
     LuaState.h

code/branches/presentation2/src/libraries/core/GUIManager.h

@@ -44 +44 @@
 #include "input/InputHandler.h"
 
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
     class PlayerInfo; // Forward declaration
 
@@ -59 +59 @@
         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:
@@ -116 +117 @@
         bool                                 bShowIngameGUI_;
 
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _GUIManager_H__ */