Changeset 6214 for code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h

Timestamp:

Dec 2, 2009, 8:41:44 PM (14 years ago)

Author:

scheusso

Message:

a small fix in IOConsole
some changes in GUI-system and preparation for keybindings menu
fix in menu handling

File:

• code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) (4 diffs)

code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h

@@ -37 +37 @@
 #include "core/OrxonoxClass.h"
 
-namespace orxonox
-{
+namespace orxonox //tolua_export
+{ //tolua_export
     /**
     @brief
@@ -51 +51 @@
         will not work as expected!
     */
-    class _CoreExport KeyBinderManager : public Singleton<KeyBinderManager>, public OrxonoxClass
-    {
+    class _CoreExport KeyBinderManager //tolua_export
+        : public Singleton<KeyBinderManager>, public OrxonoxClass
+    { //tolua_export
         friend class Singleton<KeyBinderManager>;
     public:
@@ -59 +60 @@
         void setConfigValues();
 
+        static KeyBinderManager& getInstance() { return Singleton<KeyBinderManager>::getInstance(); } //tolua_export
         //! Returns the currently selected KeyBinder
-        KeyBinder* getCurrent()
-            { return this->currentBinder_; }
+        KeyBinder* getCurrent() { return this->currentBinder_; } //tolua_export
         //! Like getCurrent(), but returns it as InputHandler* (so you don't have to include KeyBinder.h)
         InputHandler* getCurrentAsHandler();
@@ -115 +116 @@
 
         static KeyBinderManager* singletonPtr_s;
-    };
-}
+    }; //tolua_export
+} //tolua_export
 
 #endif /* _KeyBinderManager_H__ */