Changeset 386

Timestamp:

09/19/11 11:23:04 (8 months ago)

Author:

Carsten

Message:

GuiSys:
Make sure that hierarchies of windows cannot have cycles.

This prevents the crash reported in #87, but doesn't fix its cause.
(A fix addressing the cause of the problem follows.)
References #87.

Location:

cafu/trunk

Files:

• CaWE/GuiEditor/GuiDocument.cpp (modified) (1 diff)
• CaWE/GuiEditor/GuiDocument.hpp (modified) (1 diff)
• Libs/GuiSys/Window.cpp (modified) (2 diffs)

cafu/trunk/CaWE/GuiEditor/GuiDocument.cpp

@@ -122 +122 @@
 
 
-cf::GuiSys::WindowT* GuiDocumentT::FindWindowByName(const wxString& WindowName)
-{
-    if (m_RootWindow->GetName()==WindowName) return m_RootWindow;
-
-    return m_RootWindow->Find(std::string(WindowName));
-}
-
-
 void GuiDocumentT::SetSelection(const ArrayT<cf::GuiSys::WindowT*>& NewSelection)
 {

cafu/trunk/CaWE/GuiEditor/GuiDocument.hpp

@@ -59 +59 @@
         cf::GuiSys::GuiImplT* GetGui() { return m_Gui; }
         cf::GuiSys::WindowT* GetRootWindow() { return m_RootWindow; }
-        cf::GuiSys::WindowT* FindWindowByName(const wxString& WindowName);
 
         GuiPropertiesT& GetGuiProperties() { return m_GuiProperties; }

cafu/trunk/Libs/GuiSys/Window.cpp

@@ -236 +236 @@
 void WindowT::GetChildren(ArrayT<WindowT*>& Chld, bool Recurse)
 {
+#ifdef DEBUG
+    // Make sure that there are no cycles in the hierarchy of children.
+    for (unsigned long ChildNr=0; ChildNr<Children.Size(); ChildNr++)
+        assert(Chld.Find(Children[ChildNr]) == -1);
+#endif
+
     Chld.PushBack(Children);
 
@@ -906 +912 @@
     WindowT* Child=(WindowT*)cf::GuiSys::GuiImplT::GetCheckedObjectParam(LuaState, 2, TypeInfo);
 
-    if (Child->Parent!=NULL)
+    if (Child->Parent!=NULL)        // A child window must be a root node...
         return luaL_argerror(LuaState, 2, "child window already has a parent, use RemoveChild() first");
+
+    if (Child==Win->GetRoot())      // ... but not the root of the hierarchy it is inserted into.
+        return luaL_argerror(LuaState, 2, "a window cannot be made a child of itself");
 
     Win->Children.PushBack(Child);