Changeset 5887 for code/branches/core5/src/libraries/core/BaseObject.h

Timestamp:

Oct 6, 2009, 4:51:08 AM (15 years ago)

Author:

landauf

Message:

Fixed an issue with the new event-system: even states which weren't declared are not loaded. While this is normally fine, it is a problem in EventDispatcher and EventTarget which have to pipe events to other objects and therefore have to support any state, not just the native ones.

File:

• code/branches/core5/src/libraries/core/BaseObject.h (modified) (2 diffs)

code/branches/core5/src/libraries/core/BaseObject.h

@@ -172 +172 @@
             /** @brief Returns the indentation of the debug output in the Loader. @return The indentation */
             inline const std::string& getLoaderIndentation() const { return this->loaderIndentation_; }
+            
+            static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
 
         protected:
+            void addEventState(const std::string& name, EventState* container);
+            EventState* getEventState(const std::string& name) const;
+
+            std::string name_;                                 //!< The name of the object
+            std::string oldName_;                              //!< The old name of the object
+            mbool       bActive_;                              //!< True = the object is active
+            mbool       bVisible_;                             //!< True = the object is visible
+            std::string mainStateName_;
+            Functor*    mainStateFunctor_;
+
+        private:
             /** @brief Adds an object which listens to the events of this object. */
             inline void registerEventListener(BaseObject* object)
@@ -181 +194 @@
                 { this->eventListeners_.erase(object); }
 
-            void addEventState(const std::string& name, EventState* container);
-            EventState* getEventState(const std::string& name) const;
-
-            std::string name_;                                 //!< The name of the object
-            std::string oldName_;                              //!< The old name of the object
-            mbool       bActive_;                              //!< True = the object is active
-            mbool       bVisible_;                             //!< True = the object is visible
-            std::string mainStateName_;
-            Functor*    mainStateFunctor_;
-
-        private:
             void setXMLName(const std::string& name);
             Template* getTemplate(unsigned int index) const;