no real changes

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

diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index b87f9912a525d4c7c9e91ecc2617274b6af3354c..ed3cc5e5fdcde6e0d79e64bad1cc7c7b2f76435d 100644 (file)
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -13,17 +13,17 @@ class TestTree(wxRemotelyScrolledTreeCtrl):
 
         # make an image list
         im1 = im2 = -1
 
         # make an image list
         im1 = im2 = -1

-        ##self.il = wxImageList(16, 16)
-        ##im1 = self.il.Add(images.getFolder1Bitmap())
-        ##im2 = self.il.Add(images.getFile1Bitmap())
-        ##self.SetImageList(self.il)
+        self.il = wxImageList(16, 16)
+        im1 = self.il.Add(images.getFolder1Bitmap())
+        im2 = self.il.Add(images.getFile1Bitmap())
+        self.SetImageList(self.il)

 
         # Add some items
         root = self.AddRoot("Root")
         for i in range(30):
             item = self.AppendItem(root, "Item %d" % i, im1)
             for j in range(10):
 
         # Add some items
         root = self.AddRoot("Root")
         for i in range(30):
             item = self.AppendItem(root, "Item %d" % i, im1)
             for j in range(10):

-                self.AppendItem(item, "Child %d" % j, im2)
+                child = self.AppendItem(item, "Child %d" % j, im2)

 
         self.Expand(root)
 
 
         self.Expand(root)
 


@@ -33,6 +33,10 @@ class TestValueWindow(wxTreeCompanionWindow):
     def __init__(self, parent, ID, pos=wxDefaultPosition, size=wxDefaultSize, style=0):
         wxTreeCompanionWindow.__init__(self, parent, ID, pos, size, style)
         self.SetBackgroundColour("WHITE")
     def __init__(self, parent, ID, pos=wxDefaultPosition, size=wxDefaultSize, style=0):
         wxTreeCompanionWindow.__init__(self, parent, ID, pos, size, style)
         self.SetBackgroundColour("WHITE")

+        EVT_ERASE_BACKGROUND(self, self.OEB)
+
+    def OEB(self, evt):
+        pass

 
     # This method is called to draw each item in the value window
     def DrawItem(self, dc, itemId, rect):
 
     # This method is called to draw each item in the value window
     def DrawItem(self, dc, itemId, rect):


@@ -44,6 +48,10 @@ class TestValueWindow(wxTreeCompanionWindow):
                 ptext = tree.GetItemText(parent)
                 text = text + ptext + " --> "
             text = text + tree.GetItemText(itemId)
                 ptext = tree.GetItemText(parent)
                 text = text + ptext + " --> "
             text = text + tree.GetItemText(itemId)

+            pen = wxPen(wxSystemSettings_GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID)
+            dc.SetPen(pen)
+            dc.SetBrush(wxBrush(self.GetBackgroundColour(), wxSOLID))
+            dc.DrawRectangle(rect.x, rect.y, rect.width+1, rect.height)

             dc.SetTextForeground("BLACK")
             dc.SetBackgroundMode(wxTRANSPARENT)
             tw, th = dc.GetTextExtent(text)
             dc.SetTextForeground("BLACK")
             dc.SetBackgroundMode(wxTRANSPARENT)
             tw, th = dc.GetTextExtent(text)


@@ -62,7 +70,8 @@ class TestPanel(wxPanel):
                                       style=wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL)
         splitter = wxThinSplitterWindow(scroller, -1, style=wxSP_3DBORDER | wxCLIP_CHILDREN)
         splitter.SetSashSize(2)
                                       style=wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL)
         splitter = wxThinSplitterWindow(scroller, -1, style=wxSP_3DBORDER | wxCLIP_CHILDREN)
         splitter.SetSashSize(2)

-        self.tree = TestTree(splitter, -1, style=wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER)
+        self.tree = TestTree(splitter, -1, style =
+                             wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_ROW_LINES | wxNO_BORDER )

         valueWindow = TestValueWindow(splitter, -1, style=wxNO_BORDER)
 
         splitter.SplitVertically(self.tree, valueWindow)
         valueWindow = TestValueWindow(splitter, -1, style=wxNO_BORDER)
 
         splitter.SplitVertically(self.tree, valueWindow)