Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch from Andrea fixing sending of events and drawing of lines at root.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-02 21:20:16 +00:00
parent 828ed945a7
commit e734e438fc
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wxPython/wx/lib/customtreectrl.py
View File

@@ -3,7 +3,7 @@
# Inspired By And Heavily Based On wxGenericTreeCtrl. # Inspired By And Heavily Based On wxGenericTreeCtrl.
# #
# Andrea Gavana, @ 17 May 2006 # Andrea Gavana, @ 17 May 2006
# Latest Revision: 02 Mar 2007, 22.30 CET # Latest Revision: 01 Apr 2007, 22.30 CET
# #
# #
# TODO List # TODO List
@@ -134,8 +134,8 @@ CustomTreeCtrl has been tested on the following platforms:
* Mac OS (Thanks to John Jackson). * Mac OS (Thanks to John Jackson).
Latest Revision: Andrea Gavana @ 02 Mar 2007, 22.30 CET Latest Revision: Andrea Gavana @ 01 Apr 2007, 22.30 CET
Version 0.9 Version 1.0
""" """
@@ -3308,7 +3308,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
event = TreeEvent(wxEVT_TREE_DELETE_ITEM, self.GetId()) event = TreeEvent(wxEVT_TREE_DELETE_ITEM, self.GetId())
event._item = item event._item = item
event.SetEventObject(self) event.SetEventObject(self)
self.ProcessEvent(event) self.GetEventHandler().ProcessEvent(event)
def IsDescendantOf(self, parent, item): def IsDescendantOf(self, parent, item):
@@ -3453,7 +3453,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
event._item = item event._item = item
event.SetEventObject(self) event.SetEventObject(self)
if self.ProcessEvent(event) and not event.IsAllowed(): if self.GetEventHandler().ProcessEvent(event) and not event.IsAllowed():
# cancelled by program # cancelled by program
return return
@@ -3467,7 +3467,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
self.HideWindows() self.HideWindows()
event.SetEventType(wxEVT_TREE_ITEM_EXPANDED) event.SetEventType(wxEVT_TREE_ITEM_EXPANDED)
self.ProcessEvent(event) self.GetEventHandler().ProcessEvent(event)
def ExpandAllChildren(self, item): def ExpandAllChildren(self, item):
@@ -3513,7 +3513,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
event = TreeEvent(wxEVT_TREE_ITEM_COLLAPSING, self.GetId()) event = TreeEvent(wxEVT_TREE_ITEM_COLLAPSING, self.GetId())
event._item = item event._item = item
event.SetEventObject(self) event.SetEventObject(self)
if self.ProcessEvent(event) and not event.IsAllowed(): if self.GetEventHandler().ProcessEvent(event) and not event.IsAllowed():
# cancelled by program # cancelled by program
return return
@@ -3527,7 +3527,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
self.HideWindows() self.HideWindows()
event.SetEventType(wxEVT_TREE_ITEM_COLLAPSED) event.SetEventType(wxEVT_TREE_ITEM_COLLAPSED)
self.ProcessEvent(event) self.GetEventHandler().ProcessEvent(event)
def CollapseAndReset(self, item): def CollapseAndReset(self, item):
@@ -4453,7 +4453,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
# draw line down to last child # draw line down to last child
origY += self.GetLineHeight(children[0])>>1 origY += self.GetLineHeight(children[0])>>1
oldY += self.GetLineHeight(children[n-1])>>1 oldY += self.GetLineHeight(children[n-1])>>1
oldPen = dc.GetPen()
dc.SetPen(self._dottedPen)
dc.DrawLine(3, origY, 3, oldY) dc.DrawLine(3, origY, 3, oldY)
dc.SetPen(oldPen)
return y return y