Fix a Clang warning in Shiva.

[flightgear.git] / src / Canvas / elements / group.hxx

diff --git a/src/Canvas/elements/group.hxx b/src/Canvas/elements/group.hxx
index 1c07847f919c993655fd93b30ba47a2f8e724909..84cafa5b5e4627f1cfae14b11ebb9d28037ae872 100644 (file)
--- a/src/Canvas/elements/group.hxx
+++ b/src/Canvas/elements/group.hxx
@@ -21,6 +21,7 @@
 
 #include "element.hxx"
 #include <boost/shared_ptr.hpp>
+#include <list>
 #include <map>
 
 namespace canvas
@@ -32,14 +33,21 @@ namespace canvas
     public Element
   {
     public:
-      Group(SGPropertyNode_ptr node);
+      typedef std::list< std::pair< const SGPropertyNode*,
+                                    ElementPtr
+                                  >
+                       > ChildList;
+
+      Group(SGPropertyNode_ptr node, const Style& parent_style = Style());
       virtual ~Group();
 
       virtual void update(double dt);
 
     protected:
-      typedef std::map<const SGPropertyNode*, ElementPtr> ChildMap;
-      ChildMap _children;
+
+      ChildList _children;
+
+      virtual bool handleLocalMouseEvent(const canvas::MouseEvent& event);
 
       virtual void childAdded(SGPropertyNode * child);
       virtual void childRemoved(SGPropertyNode * child);