X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58be4fb13167350d827665ee233ba1108f2f77fc..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/demo/TreeCtrl.py diff --git a/wxPython/demo/TreeCtrl.py b/wxPython/demo/TreeCtrl.py index 460808c9f1..397deb0a0a 100644 --- a/wxPython/demo/TreeCtrl.py +++ b/wxPython/demo/TreeCtrl.py @@ -40,7 +40,7 @@ class TestTreeCtrlPanel(wx.Panel): il = wx.ImageList(isz[0], isz[1]) fldridx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, isz)) fldropenidx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, isz)) - fileidx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_REPORT_VIEW, wx.ART_OTHER, isz)) + fileidx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, isz)) smileidx = il.Add(images.getSmilesBitmap()) self.tree.SetImageList(il) @@ -84,32 +84,34 @@ class TestTreeCtrlPanel(wx.Panel): self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivate, self.tree) self.tree.Bind(wx.EVT_LEFT_DCLICK, self.OnLeftDClick) - self.tree.Bind(wx.EVT_RIGHT_DOWN, self.OnRightClick) + self.tree.Bind(wx.EVT_RIGHT_DOWN, self.OnRightDown) self.tree.Bind(wx.EVT_RIGHT_UP, self.OnRightUp) - - def OnRightClick(self, event): + def OnRightDown(self, event): pt = event.GetPosition(); item, flags = self.tree.HitTest(pt) - self.log.WriteText("OnRightClick: %s, %s, %s\n" % - (self.tree.GetItemText(item), type(item), item.__class__)) - self.tree.SelectItem(item) + if item: + self.log.WriteText("OnRightClick: %s, %s, %s\n" % + (self.tree.GetItemText(item), type(item), item.__class__)) + self.tree.SelectItem(item) def OnRightUp(self, event): pt = event.GetPosition(); item, flags = self.tree.HitTest(pt) - self.log.WriteText("OnRightUp: %s (manually starting label edit)\n" - % self.tree.GetItemText(item)) - self.tree.EditLabel(item) + if item: + self.log.WriteText("OnRightUp: %s (manually starting label edit)\n" + % self.tree.GetItemText(item)) + self.tree.EditLabel(item) def OnBeginEdit(self, event): self.log.WriteText("OnBeginEdit\n") # show how to prevent edit... - if self.tree.GetItemText(event.GetItem()) == "The Root Item": + item = event.GetItem() + if item and self.tree.GetItemText(item) == "The Root Item": wx.Bell() self.log.WriteText("You can't edit this one...\n") @@ -128,7 +130,8 @@ class TestTreeCtrlPanel(wx.Panel): def OnEndEdit(self, event): - self.log.WriteText("OnEndEdit\n") + self.log.WriteText("OnEndEdit: %s %s\n" % + (event.IsEditCancelled(), event.GetLabel()) ) # show how to reject edit, we'll not allow any digits for x in event.GetLabel(): if x in string.digits: @@ -140,9 +143,11 @@ class TestTreeCtrlPanel(wx.Panel): def OnLeftDClick(self, event): pt = event.GetPosition(); item, flags = self.tree.HitTest(pt) - self.log.WriteText("OnLeftDClick: %s\n" % self.tree.GetItemText(item)) - parent = self.tree.GetItemParent(item) - self.tree.SortChildren(parent) + if item: + self.log.WriteText("OnLeftDClick: %s\n" % self.tree.GetItemText(item)) + parent = self.tree.GetItemParent(item) + if parent.IsOk(): + self.tree.SortChildren(parent) event.Skip() @@ -153,25 +158,29 @@ class TestTreeCtrlPanel(wx.Panel): def OnItemExpanded(self, event): item = event.GetItem() - self.log.WriteText("OnItemExpanded: %s\n" % self.tree.GetItemText(item)) + if item: + self.log.WriteText("OnItemExpanded: %s\n" % self.tree.GetItemText(item)) def OnItemCollapsed(self, event): item = event.GetItem() - self.log.WriteText("OnItemCollapsed: %s\n" % self.tree.GetItemText(item)) + if item: + self.log.WriteText("OnItemCollapsed: %s\n" % self.tree.GetItemText(item)) def OnSelChanged(self, event): self.item = event.GetItem() - self.log.WriteText("OnSelChanged: %s\n" % self.tree.GetItemText(self.item)) - if wx.Platform == '__WXMSW__': - self.log.WriteText("BoundingRect: %s\n" % - self.tree.GetBoundingRect(self.item, True)) - #items = self.tree.GetSelections() - #print map(self.tree.GetItemText, items) + if self.item: + self.log.WriteText("OnSelChanged: %s\n" % self.tree.GetItemText(self.item)) + if wx.Platform == '__WXMSW__': + self.log.WriteText("BoundingRect: %s\n" % + self.tree.GetBoundingRect(self.item, True)) + #items = self.tree.GetSelections() + #print map(self.tree.GetItemText, items) event.Skip() def OnActivate(self, event): - self.log.WriteText("OnActivate: %s\n" % self.tree.GetItemText(self.item)) + if self.item: + self.log.WriteText("OnActivate: %s\n" % self.tree.GetItemText(self.item)) #---------------------------------------------------------------------------