Changeset 2664 for code/branches/buildsystem3/src/orxonox/gui/GUIManager.h

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/orxonox/gui/GUIManager.h (modified) (1 diff)

code/branches/buildsystem3/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_begin
     {
+// tolua_end
     public:
         enum State