AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch from Andrea that fixes the following problems/issues:

Browse Source 
a) ZeroDivisionError when using the Vista selection style and calling
SelectItem; for some strange reason, sometimes the item rect is not
initialized and that generates the ZeroDivisionError when painting the
selection rectangle;
b) Added a DeleteWindow method to GenericTreeItem class, for items
that hold a widget next to them;
c) Renamed CustomTreeCtrl method IsEnabled to IsItemEnabled, otherwise
it conflicts with wx.Window.IsEnabled;
d) Now CustomTreeCtrl behaves correctly when the widget attached to an
item is narrower (in height) than the item text;


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2007-04-17 16:26:28 +00:00
parent 59953bf4ba
commit be3eff6271
1 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# Inspired By And Heavily Based On wxGenericTreeCtrl.
#
# Andrea Gavana, @ 17 May 2006
# Latest Revision: 01 Apr 2007, 22.30 CET
# Latest Revision: 16 Apr 2007, 11.00 CET
#
#
# TODO List
@ -134,7 +134,7 @@ CustomTreeCtrl has been tested on the following platforms:
* Mac OS (Thanks to John Jackson).
Latest Revision: Andrea Gavana @ 01 Apr 2007, 22.30 CET
Latest Revision: Andrea Gavana @ 16 Apr 2007, 11.00 CET
Version 1.0
"""
@ -1164,28 +1164,7 @@ class GenericTreeItem:
self._wnd = wnd # are we holding a window?
if wnd:
if wnd.GetSizer(): # the window is a complex one hold by a sizer
size = wnd.GetBestSize()
else: # simple window, without sizers
size = wnd.GetSize()
# We have to bind the wx.EVT_SET_FOCUS for the associated window
# No other solution to handle the focus changing from an item in
# CustomTreeCtrl and the window associated to an item
# Do better strategies exist?
self._wnd.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
self._height = size.GetHeight() + 2
self._width = size.GetWidth()
self._windowsize = size
# We don't show the window if the item is collapsed
if self._isCollapsed:
self._wnd.Show(False)
# The window is enabled only if the item is enabled
self._wnd.Enable(self._enabled)
self._windowenabled = self._enabled
self.SetWindow(wnd)
def IsOk(self):
@ -1310,6 +1289,29 @@ class GenericTreeItem:
self._wnd = wnd
if wnd.GetSizer(): # the window is a complex one hold by a sizer
size = wnd.GetBestSize()
else: # simple window, without sizers
size = wnd.GetSize()
# We have to bind the wx.EVT_SET_FOCUS for the associated window
# No other solution to handle the focus changing from an item in
# CustomTreeCtrl and the window associated to an item
# Do better strategies exist?
self._wnd.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
self._height = size.GetHeight() + 2
self._width = size.GetWidth()
self._windowsize = size
# We don't show the window if the item is collapsed
if self._isCollapsed:
self._wnd.Show(False)
# The window is enabled only if the item is enabled
self._wnd.Enable(self._enabled)
self._windowenabled = self._enabled
def GetWindow(self):
"""Returns the window associated to the item."""
@ -1317,6 +1319,14 @@ class GenericTreeItem:
return self._wnd
def DeleteWindow(self):
"""Deletes the window associated to the item (if any)."""
if self._wnd:
self._wnd.Destroy()
self._wnd = None
def GetWindowEnabled(self):
"""Returns whether the associated window is enabled or not."""
@ -2055,7 +2065,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
self.RefreshLine(item)
def IsEnabled(self, item):
def IsItemEnabled(self, item):
"""Returns whether an item is enabled or disabled."""
if not item:
@ -4202,6 +4212,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
r2, g2, b2 = int(bottom.Red()), int(bottom.Green()), int(bottom.Blue())
flrect = float(filRect.height)
if flrect < 1:
flrect = self._lineHeight
rstep = float((r2 - r1)) / flrect
gstep = float((g2 - g1)) / flrect
@ -4244,7 +4256,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
dc.SetTextForeground(self.GetHyperTextVisitedColour())
else:
dc.SetTextForeground(self.GetHyperTextNewColour())
text_w, text_h, dummy = dc.GetMultiLineTextExtent(item.GetText())
image = item.GetCurrentImage()
@ -4316,7 +4328,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
wx.RendererNative.Get().DrawItemSelectionRect(self, dc, itemrect, flags)
else:
dc.DrawRectangleRect(itemrect)
else:
if item.IsSelected():
@ -4415,6 +4427,9 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
wndx = wcheck + image_w + item.GetX() + text_w + 4
xa, ya = self.CalcScrolledPosition((0, item.GetY()))
wndx += xa
if item.GetHeight() > item.GetWindowSize()[1]:
ya += (item.GetHeight() - item.GetWindowSize()[1])/2
if not wnd.IsShown():
wnd.Show()
if wnd.GetPosition() != (wndx, ya):
@ -4742,11 +4757,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
keyCode = event.GetKeyCode()
if keyCode in [ord("+"), wx.WXK_ADD]: # "+"
if self._current.HasPlus() and not self.IsExpanded(self._current) and self.IsEnabled(self._current):
if self._current.HasPlus() and not self.IsExpanded(self._current) and self.IsItemEnabled(self._current):
self.Expand(self._current)
elif keyCode in [ord("*"), wx.WXK_MULTIPLY]: # "*"
if not self.IsExpanded(self._current) and self.IsEnabled(self._current):
if not self.IsExpanded(self._current) and self.IsItemEnabled(self._current):
# expand all
self.ExpandAll(self._current)
@ -4766,7 +4781,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
elif keyCode in [wx.WXK_RETURN, wx.WXK_SPACE]:
if not self.IsEnabled(self._current):
if not self.IsItemEnabled(self._current):
event.Skip()
return
@ -4799,7 +4814,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
if prev:
current = self._key_current
# TODO: Huh? If we get here, we'd better be the first child of our parent. How else could it be?
if current == self.GetFirstChild(prev)[0] and self.IsEnabled(prev):
if current == self.GetFirstChild(prev)[0] and self.IsItemEnabled(prev):
# otherwise we return to where we came from
self.DoSelectItem(prev, unselect_others, extended_select)
self._key_current = prev
@ -4815,13 +4830,13 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
current = prev
# Try to get the previous siblings and see if they are active
while prev and not self.IsEnabled(prev):
while prev and not self.IsItemEnabled(prev):
prev = self.GetPrevSibling(prev)
if not prev:
# No previous siblings active: go to the parent and up
prev = self.GetItemParent(current)
while prev and not self.IsEnabled(prev):
while prev and not self.IsItemEnabled(prev):
prev = self.GetItemParent(prev)
if prev:
@ -4839,7 +4854,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
if self.IsExpanded(self._current):
self.Collapse(self._current)
else:
if prev and self.IsEnabled(prev):
if prev and self.IsItemEnabled(prev):
self.DoSelectItem(prev, unselect_others, extended_select)
elif keyCode == wx.WXK_RIGHT:
@ -4847,7 +4862,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
# also expand the item if it wasn't expanded yet
if self.IsExpanded(self._current) and self.HasChildren(self._current):
child, cookie = self.GetFirstChild(self._key_current)
if self.IsEnabled(child):
if self.IsItemEnabled(child):
self.DoSelectItem(child, unselect_others, extended_select)
self._key_current = child
else:
@ -4873,11 +4888,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
current = self.GetItemParent(current)
if current:
next = self.GetNextSibling(current)
if not next or not self.IsEnabled(next):
if not next or not self.IsItemEnabled(next):
next = None
else:
while next and not self.IsEnabled(next):
while next and not self.IsItemEnabled(next):
next = self.GetNext(next)
if next:
@ -4902,7 +4917,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
last = lastChild
if last and self.IsEnabled(last):
if last and self.IsItemEnabled(last):
self.DoSelectItem(last, unselect_others, extended_select)
@ -4919,7 +4934,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
if not prev:
return
if self.IsEnabled(prev):
if self.IsItemEnabled(prev):
self.DoSelectItem(prev, unselect_others, extended_select)
else:
@ -4936,7 +4951,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
# no such item
return
if self.IsEnabled(id):
if self.IsItemEnabled(id):
self.SelectItem(id)
self._findPrefix += ch
@ -4968,7 +4983,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
while 1:
child = sibling(item)
if (child and self.IsEnabled(child)) or not child:
if (child and self.IsItemEnabled(child)) or not child:
break
item = child
@ -4976,10 +4991,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
# Tha's not a radiobutton... but some of its children can be
# inactive
child, cookie = self.GetFirstChild(item)
while child and not self.IsEnabled(child):
while child and not self.IsItemEnabled(child):
child, cookie = self.GetNextChild(item, cookie)
if child and self.IsEnabled(child):
if child and self.IsItemEnabled(child):
return child
return None
@ -5033,7 +5048,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
flags = TREE_HITTEST_NOWHERE
return None, flags
if not self.IsEnabled(hit):
if not self.IsItemEnabled(hit):
return None, flags
return hit, flags
@ -5552,6 +5567,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
item.SetHeight(total_h)
else:
item.SetWidth(item.GetWindowSize()[0]+image_w+text_w+wcheck+2)
item.SetHeight(max(total_h, item.GetWindowSize()[1]))
def CalculateLevel(self, item, dc, level, y):