Changeset 7009 for code/branches/presentation3/src/orxonox

Timestamp:

May 29, 2010, 9:56:07 PM (14 years ago)

Author:

dafrick

Message:

Enabled the ChatBox to be closed by pressing the close button in the upper right corner of the frame window.

Location:

code/branches/presentation3/src/orxonox

Files:

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

code/branches/presentation3/src/orxonox/CMakeLists.txt

@@ -57 +57 @@
   FIND_HEADER_FILES
   TOLUA_FILES
+    ChatInputHandler.h
     LevelManager.h
     MoodManager.h

code/branches/presentation3/src/orxonox/ChatInputHandler.h

@@ -54 +54 @@
 #include <util/Singleton.h>
 
-
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
   /* class to handle chat using an InputBuffer */
-  class _OrxonoxExport ChatInputHandler : public Singleton<ChatInputHandler>,
-    public ChatListener
-  {
+  class _OrxonoxExport ChatInputHandler  // tolua_export
+    : public Singleton<ChatInputHandler>, public ChatListener
+  { // tolua_export
     private:
       /** Input buffer, to be used to catch input from the
@@ -103 +102 @@
       friend class Singleton<ChatInputHandler>;
 
+      static ChatInputHandler& getInstance(void) { return Singleton<ChatInputHandler>::getInstance(); }  // tolua_export
+
       /** start listening */
       static void activate_static();
@@ -127 +128 @@
 
       /** Deactivate the chat window, meaning: hide it. */
-      void deactivate();
+      void deactivate();  // tolua_export
 
-  };
+  };  // tolua_export
 
 
-}
+}  // tolua_export