Ensure item is valid before using it.

[wxWidgets.git] / wxPython / wx / tools / XRCed / xrced.py

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index f1ba7d58c841433dc8766690a8eae5bdd87dd129..8b44b5e2cf6dc41a368d9ff03a09c429f8457633 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -348,7 +348,7 @@ class Frame(wxFrame):
         # Expanded container (must have children)
         elif tree.IsExpanded(selected) and tree.GetChildrenCount(selected, False):
             # Insert as first child
         # Expanded container (must have children)
         elif tree.IsExpanded(selected) and tree.GetChildrenCount(selected, False):
             # Insert as first child

-            nextItem = tree.GetFirstChild(selected, 0)[0]
+            nextItem = tree.GetFirstChild(selected)[0]

             parentLeaf = selected
         else:
             # No children or unexpanded item - appendChild stays True
             parentLeaf = selected
         else:
             # No children or unexpanded item - appendChild stays True


@@ -619,7 +619,7 @@ Homepage: http://xrced.sourceforge.net\
         # Expanded container (must have children)
         elif tree.shift and tree.IsExpanded(selected) \
            and tree.GetChildrenCount(selected, False):
         # Expanded container (must have children)
         elif tree.shift and tree.IsExpanded(selected) \
            and tree.GetChildrenCount(selected, False):

-            nextItem = tree.GetFirstChild(selected, 0)[0]
+            nextItem = tree.GetFirstChild(selected)[0]

             parentLeaf = selected
         else:
             nextItem = wxTreeItemId()
             parentLeaf = selected
         else:
             nextItem = wxTreeItemId()


@@ -701,7 +701,7 @@ Homepage: http://xrced.sourceforge.net\
         xxx = MakeXXXFromDOM(parentXXX, elem)
         # Update parent in child objects
         if tree.ItemHasChildren(selected):
         xxx = MakeXXXFromDOM(parentXXX, elem)
         # Update parent in child objects
         if tree.ItemHasChildren(selected):

-            i, cookie = tree.GetFirstChild(selected, 0)
+            i, cookie = tree.GetFirstChild(selected)

             while i.IsOk():
                 x = tree.GetPyData(i)
                 x.parent = xxx
             while i.IsOk():
                 x = tree.GetPyData(i)
                 x.parent = xxx


@@ -1004,6 +1004,7 @@ class App(wxApp):
 
 def main():
     app = App(0, useBestVisual=False)
 
 def main():
     app = App(0, useBestVisual=False)

+    #app.SetAssertMode(wxPYAPP_ASSERT_LOG)

     app.MainLoop()
     app.OnExit()
     global conf
     app.MainLoop()
     app.OnExit()
     global conf