Changeset 6367 for code/branches

Timestamp:

Dec 16, 2009, 10:19:32 PM (15 years ago)

Author:

rgrieder

Message:

Moved CEGUI event hack from KeyBinderManager to GUIManager and made the function static.

Location:

code/branches/presentation2/src/libraries/core

Files:

• GUIManager.cc (modified) (2 diffs)
• GUIManager.h (modified) (1 diff)
• input/KeyBinderManager.cc (modified) (2 diffs)
• input/KeyBinderManager.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include <CEGUIResourceProvider.h>
 #include <CEGUISystem.h>
+#include <CEGUIWindow.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 
@@ -347 +348 @@
         }
     }
+
+    void GUIManager::subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function)
+    {
+        window->subscribeScriptedEvent(event, function);
+    }
 }

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

@@ -84 +84 @@
             { std::map<std::string, PlayerInfo*>::const_iterator it = this->players_.find(guiname); return (it != this->players_.end()) ? it->second : 0; }
 
+        // TODO: Temporary hack because the tolua exported CEGUI method does not seem to work
+        static void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
+
     private:
         GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)

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

@@ -28 +28 @@
 
 #include "KeyBinderManager.h"
-
-#include <CEGUIWindow.h>
 
 #include "util/Debug.h"
@@ -103 +101 @@
     {
         this->currentBinder_->setBinding("", binding, true);
-    }
-    
-    void KeyBinderManager::subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function)
-    {
-        window->subscribeScriptedEvent(event, function);
     }
 

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

@@ -35 +35 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
-#include <CEGUIForwardRefs.h>
 
 #include "util/Singleton.h"
@@ -82 +81 @@
         void setToDefault()
             { this->setCurrent(this->defaultFilename_); }
-            
-        void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
 
         //! Returns a pointer to a KeyBinder (creates it if not yet loaded)