'[1219035] cleanup: miscellaneous' and minor source cleaning.

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

diff --git a/wxPython/demo/TreeListCtrl.py b/wxPython/demo/TreeListCtrl.py
index 327a238b7c0210ad53b8bbc01b0278ef87e230b7..10bc4576e870ed4018bb26987a1b8eff56a5198e 100644 (file)
--- a/wxPython/demo/TreeListCtrl.py
+++ b/wxPython/demo/TreeListCtrl.py
@@ -17,13 +17,20 @@ class TestPanel(wx.Panel):
                                         #wx.TR_TWIST_BUTTONS
                                         #| wx.TR_ROW_LINES
                                         #| wx.TR_NO_LINES 
                                         #wx.TR_TWIST_BUTTONS
                                         #| wx.TR_ROW_LINES
                                         #| wx.TR_NO_LINES 

-                                        | wx.TR_FULL_ROW_HIGHLIGHT     
+                                        | wx.TR_FULL_ROW_HIGHLIGHT
+
+                                        # By default the style will be adjusted on
+                                        # Mac to use twisty buttons and no lines.  If
+                                        # you would rather control this yourself then
+                                        # add this style.
+                                        #| wx.TR_DONT_ADJUST_MAC

                                    )
                                    )

+

         isz = (16,16)
         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))
         isz = (16,16)
         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)
         smileidx    = il.Add(images.getSmilesBitmap())
 
         self.tree.SetImageList(il)


@@ -75,17 +82,11 @@ class TestPanel(wx.Panel):
 
 
     def OnRightUp(self, evt):
 
 
     def OnRightUp(self, evt):

-        # Convert the position from being relative to the subwindow to
-        # being relative to the outer treelist window so HitTest will
-        # have the point it is expecting.

         pos = evt.GetPosition()
         pos = evt.GetPosition()

-        pos = self.tree.GetMainWindow().ClientToScreen(pos)
-        pos = self.tree.ScreenToClient(pos)

         item, flags, col = self.tree.HitTest(pos)
         item, flags, col = self.tree.HitTest(pos)

-

         if item:
         if item:

-            print flags, col, self.tree.GetItemText(item, col)
-
+            self.log.write('Flags: %s, Col:%s, Text: %s' %
+                           (flags, col, self.tree.GetItemText(item, col)))

 
     def OnSize(self, evt):
         self.tree.SetSize(self.GetSize())
 
     def OnSize(self, evt):
         self.tree.SetSize(self.GetSize())