From f1c90907c3432aae6be83d9134c29059023c6ee1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 20 Oct 2000 16:54:23 +0000 Subject: [PATCH] fixed a CVS conflict git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/wxTreeCtrl.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wxPython/demo/wxTreeCtrl.py b/wxPython/demo/wxTreeCtrl.py index ec7dfb4868..64f8662fd4 100644 --- a/wxPython/demo/wxTreeCtrl.py +++ b/wxPython/demo/wxTreeCtrl.py @@ -21,14 +21,15 @@ class MyTreeCtrl(wxTreeCtrl): class TestTreeCtrlPanel(wxPanel): def __init__(self, parent, log): - wxPanel.__init__(self, parent, -1) + # Use the WANTS_CHARS style so the panel doesn't eat the Return key. + wxPanel.__init__(self, parent, -1, style=wxWANTS_CHARS) EVT_SIZE(self, self.OnSize) self.log = log tID = NewId() self.tree = MyTreeCtrl(self, tID, wxDefaultPosition, wxDefaultSize, - wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_MULTIPLE) + wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS)# | wxTR_MULTIPLE) #il = wxImageList(16, 16) #idx1 = il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP)) @@ -68,6 +69,7 @@ class TestTreeCtrlPanel(wxPanel): EVT_TREE_SEL_CHANGED (self, tID, self.OnSelChanged) EVT_TREE_BEGIN_LABEL_EDIT(self, tID, self.OnBeginEdit) EVT_TREE_END_LABEL_EDIT (self, tID, self.OnEndEdit) + EVT_TREE_ITEM_ACTIVATED (self, tID, self.OnActivate) EVT_LEFT_DCLICK(self.tree, self.OnLeftDClick) EVT_RIGHT_DOWN(self.tree, self.OnRightClick) @@ -143,6 +145,10 @@ class TestTreeCtrlPanel(wxPanel): event.Skip() + def OnActivate(self, evt): + self.log.WriteText("OnActivate: %s\n" % self.tree.GetItemText(self.item)) + + #--------------------------------------------------------------------------- def runTest(frame, nb, log):