merged fixes for accel and command event non propagation from 2.2

[wxWidgets.git] / wxPython / demo / wxTreeCtrl.py

diff --git a/wxPython/demo/wxTreeCtrl.py b/wxPython/demo/wxTreeCtrl.py
index 64f8662fd46b3e03087cb355717de7c5ad0bb7b2..7f10a1fbec0fb11fe76fdf91f7d8b6c1abf63fe4 100644 (file)
--- a/wxPython/demo/wxTreeCtrl.py
+++ b/wxPython/demo/wxTreeCtrl.py
@@ -6,13 +6,14 @@ import string
 #---------------------------------------------------------------------------
 
 class MyTreeCtrl(wxTreeCtrl):
-    def __init__(self, parent, id, pos, size, style):
+    def __init__(self, parent, id, pos, size, style, log):
         wxTreeCtrl.__init__(self, parent, id, pos, size, style)
-
+        self.log = log
 
     def OnCompareItems(self, item1, item2):
         t1 = self.GetItemText(item1)
         t2 = self.GetItemText(item2)
+        self.log.WriteText('compare: ' + t1 + ' <> ' + t2 + '\n')
         if t1 < t2: return -1
         if t1 == t2: return 0
         return 1
@@ -29,14 +30,17 @@ class TestTreeCtrlPanel(wxPanel):
         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
+                               , self.log)
+
 
+        #import images
         #il = wxImageList(16, 16)
-        #idx1 = il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
-        #idx2 = il.Add(wxBitmap('bitmaps/open.bmp', wxBITMAP_TYPE_BMP))
-        #idx3 = il.Add(wxBitmap('bitmaps/new.bmp', wxBITMAP_TYPE_BMP))
-        #idx4 = il.Add(wxBitmap('bitmaps/copy.bmp', wxBITMAP_TYPE_BMP))
-        #idx5 = il.Add(wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP))
+        #idx1 = il.Add(images.getSmilesBitmap())
+        #idx2 = il.Add(images.getOpenBitmap())
+        #idx3 = il.Add(images.getNewBitmap())
+        #idx4 = il.Add(images.getCopyBitmap())
+        #idx5 = il.Add(images.getPasteBitmap())
 
         #self.tree.SetImageList(il)
         #self.il = il