Changeset 2234 for code/branches/buildsystem/src/orxonox/gui/GUIManager.h

Timestamp:

Nov 19, 2008, 9:18:42 PM (15 years ago)

Author:

rgrieder

Message:

Modified package.lua to automatically remove all _LibExport macros to avoid class name conflicts.
Also adjusted hacky code in CommandExecutor, Script and GUIManager.

File:

• code/branches/buildsystem/src/orxonox/gui/GUIManager.h (modified) (1 diff)

code/branches/buildsystem/src/orxonox/gui/GUIManager.h

@@ -42 +42 @@
 #include "core/input/InputInterfaces.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
     /**
     @brief
         Provides a simple interface to CEGUI with tolua methods and console commands
     */
-    class _OrxonoxExport GUIManager : public KeyHandler, public MouseHandler
-    /*
-    class GUIManager { // tolua_export
-    */
-    {
+    class _OrxonoxExport GUIManager
+// tolua_end
+                : public KeyHandler, public MouseHandler
+    { // tolua_export
     public:
         enum State