Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.

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

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 4c6817b53590f0684ecec292f2856a18855dfc6b..55bbca94b5a8fa3f09b13fe158f07814eb45def4 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -365,7 +365,7 @@ def SetMenu(m, list, shift=False):
             apply(m.Append, l)
         elif type(l) == types.ListType:
             subMenu = wxMenu()
-            SetMenu(subMenu, l[2:])
+            SetMenu(subMenu, l[2:], shift)
             m.AppendMenu(wxNewId(), l[0], subMenu, l[1])
         else:                           # separator
             m.AppendSeparator()
@@ -419,6 +419,7 @@ class XML_Tree(wxTreeCtrl):
         EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)
 
         self.selection = None
+       self.selectionChanging = False
         self.needUpdate = False
         self.pendingHighLight = None
         self.ctrl = self.shift = False
@@ -474,6 +475,8 @@ class XML_Tree(wxTreeCtrl):
 
     # Clear tree
     def Clear(self):
+        self.selection = None
+        self.UnselectAll()
         self.DeleteAllItems()
         # Add minimal structure
         if self.dom: self.dom.unlink()
@@ -486,11 +489,12 @@ class XML_Tree(wxTreeCtrl):
         self.root = self.AddRoot('XML tree', self.rootImage,
                                  data=wxTreeItemData(self.rootObj))
         self.SetItemHasChildren(self.root)
-        self.Unselect()
         self.Expand(self.root)
 
     # Clear old data and set new
     def SetData(self, dom):
+        self.selection = None
+        self.UnselectAll()
         self.DeleteAllItems()
         # Add minimal structure
         if self.dom: self.dom.unlink()
@@ -510,7 +514,6 @@ class XML_Tree(wxTreeCtrl):
                 self.mainNode.removeChild(node)
                 node.unlink()
         self.Expand(self.root)
-        self.Unselect()
 
     # Add tree item for given parent item if node is DOM element node with
     # object/object_ref tag. xxxParent is parent xxx object
@@ -641,7 +644,11 @@ class XML_Tree(wxTreeCtrl):
         return child
 
     def OnSelChanged(self, evt):
-        self.ChangeSelection(evt.GetItem())
+        if self.selectionChanging: return
+       self.selectionChanging = True
+        self.UnselectAll()
+        self.SelectItem(evt.GetItem())
+       self.selectionChanging = False
 
     def ChangeSelection(self, item):
         # Apply changes
@@ -761,7 +768,6 @@ class XML_Tree(wxTreeCtrl):
 #                return
 
         wxBeginBusyCursor()
-        wxYield()
         # Close old window, remember where it was
         highLight = None
         if testWin:
@@ -965,6 +971,14 @@ class XML_Tree(wxTreeCtrl):
             return False
         return not (self.IsExpanded(item) and self.GetChildrenCount(item, False))
 
+    # Override to use like single-selection tree
+    def GetSelection(self):
+        return self.selection
+    def SelectItem(self, item):
+        self.UnselectAll()
+        self.ChangeSelection(item)
+        wxTreeCtrl.SelectItem(self, item)
+
     # Pull-down
     def OnRightDown(self, evt):
         pullDownMenu = g.pullDownMenu