X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..3dc0174140ffc52a08fd5b64cf839babad09e5cf:/wxPython/demo/wxTreeCtrl.py

diff --git a/wxPython/demo/wxTreeCtrl.py b/wxPython/demo/wxTreeCtrl.py
index 9f1c20183a..5d48ef5050 100644
--- 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
@@ -21,24 +22,28 @@ 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
+                               , self.log)
+
 
-        #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))
+        ##import images
+        ##il = wxImageList(16, 16)
+        ##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
+        ##self.tree.SetImageList(il)
+        ##self.il = il
 
         # NOTE:  For some reason tree items have to have a data object in
         #        order to be sorted.  Since our compare just uses the labels
@@ -46,18 +51,18 @@ class TestTreeCtrlPanel(wxPanel):
 
         self.root = self.tree.AddRoot("The Root Item")
         self.tree.SetPyData(self.root, None)
-        #self.tree.SetItemImage(self.root, idx1)
+        ##self.tree.SetItemImage(self.root, idx1)
 
         for x in range(15):
             child = self.tree.AppendItem(self.root, "Item %d" % x)
             self.tree.SetPyData(child, None)
-            #self.tree.SetItemImage(child, idx2)
-            #self.tree.SetItemSelectedImage(child, idx3)
+            ##self.tree.SetItemImage(child, idx2, wxTreeItemIcon_Expanded)
+            ##self.tree.SetItemSelectedImage(child, idx3)
             for y in range(5):
                 last = self.tree.AppendItem(child, "item %d-%s" % (x, chr(ord("a")+y)))
                 self.tree.SetPyData(last, None)
-                #self.tree.SetItemImage(last, idx4)
-                #self.tree.SetItemSelectedImage(last, idx5)
+                ##self.tree.SetItemImage(last, idx4)
+                ##self.tree.SetItemSelectedImage(last, idx5)
                 for z in range(5):
                     item = self.tree.AppendItem(last,  "item %d-%s-%d" % (x, chr(ord("a")+y), z))
                     self.tree.SetPyData(item, None)
@@ -68,6 +73,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)
@@ -77,8 +83,8 @@ class TestTreeCtrlPanel(wxPanel):
     def OnRightClick(self, event):
         pt = event.GetPosition();
         item, flags = self.tree.HitTest(pt)
-        self.log.WriteText("OnRightClick: %s, %s\n" % (self.tree.GetItemText(item),
-                                                       type(item)))
+        self.log.WriteText("OnRightClick: %s, %s, %s\n" %
+                           (self.tree.GetItemText(item), type(item), item.__class__))
         self.tree.SelectItem(item)
 
 
@@ -135,9 +141,16 @@ class TestTreeCtrlPanel(wxPanel):
     def OnSelChanged(self, event):
         self.item = event.GetItem()
         self.log.WriteText("OnSelChanged: %s\n" % self.tree.GetItemText(self.item))
-        self.log.WriteText("BoundingRect: %s\n" %
-                           self.tree.GetBoundingRect(self.item, true))
+        if wxPlatform == '__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, evt):
+        self.log.WriteText("OnActivate: %s\n" % self.tree.GetItemText(self.item))
 
 
 #---------------------------------------------------------------------------
@@ -160,37 +173,7 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
-
-
 overview = """\
 A tree control presents information as a hierarchy, with items that may be expanded to show further items. Items in a tree control are referenced by wxTreeItemId handles.
 
-wxTreeCtrl()
--------------------------
-
-Default constructor.
-
-wxTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl")
-
-Constructor, creating and showing a tree control.
-
-Parameters
--------------------
-
-parent = Parent window. Must not be NULL.
-
-id = Window identifier. A value of -1 indicates a default value.
-
-pos = Window position.
-
-size = Window size. If the default size (-1, -1) is specified then the window is sized appropriately.
-
-style = Window style. See wxTreeCtrl.
-
-validator = Window validator.
-
-name = Window name.
 """