DocView patches from Morgen Hua: bug fixes, and additional SVN

[wxWidgets.git] / wxPython / samples / ide / activegrid / tool / OutlineService.py

diff --git a/wxPython/samples/ide/activegrid/tool/OutlineService.py b/wxPython/samples/ide/activegrid/tool/OutlineService.py
index 858fbade75b3d1c772de4acf2be3135b097eaa70..573327db894e132c4154f3d2e2de68c950badb36 100644 (file)
--- a/wxPython/samples/ide/activegrid/tool/OutlineService.py
+++ b/wxPython/samples/ide/activegrid/tool/OutlineService.py
@@ -84,6 +84,7 @@ class OutlineView(Service.ServiceView):
         item = self.GetControl().GetSelection()
         if item:
             self.GetControl().CallDoSelectCallback(item)
         item = self.GetControl().GetSelection()
         if item:
             self.GetControl().CallDoSelectCallback(item)

+        event.Skip()

 
 
     def ResumeActionOnSelect(self):
 
 
     def ResumeActionOnSelect(self):


@@ -156,11 +157,8 @@ class OutlineView(Service.ServiceView):
                 treeCtrl.Expand(child)
             (child, cookie) = treeCtrl.GetNextChild(parentItem, cookie)
 
                 treeCtrl.Expand(child)
             (child, cookie) = treeCtrl.GetNextChild(parentItem, cookie)
 

-        # wxBug: This causes a crash, tried using ScrollTo which crashed as well.  Then tried calling it with wx.CallAfter and that crashed as well, with both EnsureVisible and ScrollTo
-        # self.GetControl().EnsureVisible(self.GetControl().GetRootItem())
-        # So doing the following massive hack which forces the treectrl to scroll up to the top item
-        treeCtrl.Collapse(parentItem)
-        treeCtrl.Expand(parentItem)
+        if parentItem:
+            treeCtrl.EnsureVisible(parentItem)

 
 
 class OutlineTreeCtrl(wx.TreeCtrl):
 
 
 class OutlineTreeCtrl(wx.TreeCtrl):