X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..d02bc4c8d40b855c05a4c2103a584b2ecdc7788c:/wxPython/wx/tools/XRCed/tree.py?ds=inline

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 1568d14333..06e43c5d00 100644
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -5,6 +5,7 @@
 # RCS-ID:       $Id$
 
 from xxx import *                       # xxx imports globals and params
+import types
 
 # Constant to define standart window name
 STD_NAME = '_XRCED_T_W'
@@ -94,6 +95,7 @@ class PullDownMenu:
     ID_EXPAND = wxNewId()
     ID_COLLAPSE = wxNewId()
     ID_PASTE_SIBLING = wxNewId()
+    ID_SUBCLASS = wxNewId()
 
     def __init__(self, parent):
         self.ID_DELETE = parent.ID_DELETE
@@ -102,6 +104,7 @@ class PullDownMenu:
         EVT_MENU(parent, self.ID_COLLAPSE, parent.OnCollapse)
         EVT_MENU(parent, self.ID_EXPAND, parent.OnExpand)
         EVT_MENU(parent, self.ID_PASTE_SIBLING, parent.OnPaste)
+        EVT_MENU(parent, self.ID_SUBCLASS, parent.OnSubclass)
         # We connect to tree, but process in frame
         EVT_MENU_HIGHLIGHT_ALL(g.tree, parent.OnPullDownHighlight)
 
@@ -377,7 +380,7 @@ class XML_Tree(wxTreeCtrl):
     def ExpandAll(self, item):
         if self.ItemHasChildren(item):
             self.Expand(item)
-            i, cookie = self.GetFirstChild(item, 0)
+            i, cookie = self.GetFirstChild(item)
             children = []
             while i.IsOk():
                 children.append(i)
@@ -386,7 +389,7 @@ class XML_Tree(wxTreeCtrl):
                 self.ExpandAll(i)
     def CollapseAll(self, item):
         if self.ItemHasChildren(item):
-            i, cookie = self.GetFirstChild(item, 0)
+            i, cookie = self.GetFirstChild(item)
             children = []
             while i.IsOk():
                 children.append(i)
@@ -409,8 +412,8 @@ class XML_Tree(wxTreeCtrl):
         self.root = self.AddRoot('XML tree', self.rootImage,
                                  data=wxTreeItemData(self.rootObj))
         self.SetItemHasChildren(self.root)
-        self.Expand(self.root)
         self.Unselect()
+        self.Expand(self.root)
 
     # Clear old data and set new
     def SetData(self, dom):
@@ -646,7 +649,7 @@ class XML_Tree(wxTreeCtrl):
 #        if xxx.__class__ == xxxFrame:
             # Frame can't have many children,
             # but it's first child possibly can...
-#            child = self.GetFirstChild(item, 0)[0]
+#            child = self.GetFirstChild(item)[0]
 #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
 #                # Clean-up before recursive call or error
 #                wxMemoryFSHandler_RemoveFile('xxx.xrc')
@@ -721,7 +724,7 @@ class XML_Tree(wxTreeCtrl):
         if xxx.__class__ == xxxFrame:
             # Frame can't have many children,
             # but it's first child possibly can...
-#            child = self.GetFirstChild(item, 0)[0]
+#            child = self.GetFirstChild(item)[0]
 #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
 #                # Clean-up before recursive call or error
 #                wxMemoryFSHandler_RemoveFile('xxx.xrc')
@@ -809,7 +812,7 @@ class XML_Tree(wxTreeCtrl):
         if index is None: return wxTreeItemId()
         item = self.root
         for i in index:
-            item = self.GetFirstChild(item, 0)[0]
+            item = self.GetFirstChild(item)[0]
             for k in range(i): item = self.GetNextSibling(item)
         return item
 
@@ -902,6 +905,8 @@ class XML_Tree(wxTreeCtrl):
                 id = wxNewId()
                 menu.AppendMenu(id, 'Replace With', m)
                 if not m.GetMenuItemCount(): menu.Enable(id, False)
+                menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
+                            'Set subclass property')
             menu.AppendSeparator()
             # Not using standart IDs because we don't want to show shortcuts
             menu.Append(wxID_CUT, 'Cut', 'Cut to the clipboard')