Changeset 123 for cafu/trunk/CaWE/GuiEditor/WindowTree.cpp

Timestamp:

08/19/10 23:35:41 (21 months ago)

Author:

Carsten

Message:

CaWE GUI Editor: Rewrote/fixed broken "delete windows" command.

Files:

• cafu/trunk/CaWE/GuiEditor/WindowTree.cpp (modified) (5 diffs)

cafu/trunk/CaWE/GuiEditor/WindowTree.cpp

@@ -281 +281 @@
         wxASSERT(Windows.Size()==1); // Can't set the name property for more windows since it must always be unique.
 
-        wxTreeItemId TreeItem=FindTreeItem(GetRootItem(), Windows[0]);
-
         SetItemText(FindTreeItem(GetRootItem(), Windows[0]), Windows[0]->Name);
     }
@@ -290 +288 @@
         for (unsigned long WindowNr=0; WindowNr<Windows.Size(); WindowNr++)
         {
-            int ImageNr=0;
-
-            if (!Windows[WindowNr]->ShowWindow) ImageNr=1;
-
-            SetItemImage(FindTreeItem(GetRootItem(), Windows[WindowNr]), ImageNr);
+            SetItemImage(FindTreeItem(GetRootItem(), Windows[WindowNr]), Windows[WindowNr]->ShowWindow ? 0 : 1);
         }
     }
@@ -307 +301 @@
     ArrayT<wxTreeItemId>         TreeItems;
     ArrayT<cf::GuiSys::WindowT*> ExpandedWindows;
+
+    // Note that this may well produce TreeItems whose windows have been deleted from the document already.
     GetTreeItems(GetRootItem(), TreeItems);
 
@@ -344 +340 @@
 
             // Make sure parents are also expanded.
-            while(GetItemParent(Result).IsOk())
+            while (GetItemParent(Result).IsOk())
             {
                 Result=GetItemParent(Result);
@@ -356 +352 @@
     // Expand all previously expanded items.
     for (unsigned long ExWinNr=0; ExWinNr<ExpandedWindows.Size(); ExWinNr++)
-        Expand(FindTreeItem(GetRootItem(), ExpandedWindows[ExWinNr]));
+    {
+        wxTreeItemId Result=FindTreeItem(GetRootItem(), ExpandedWindows[ExWinNr]);
+
+        if (Result.IsOk())
+            Expand(Result);
+    }
 
     Thaw();