no changes

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

diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index ee6b5f132175ba4055a809fdbfe0c7582fa04a6e..698d2f639d1e979a139d607d7bae6907c5d701ce 100644 (file)
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -9,19 +9,20 @@ class TestTree(wxRemotelyScrolledTreeCtrl):
     def __init__(self, parent, ID, pos=wxDefaultPosition, size=wxDefaultSize,
                  style=wxTR_HAS_BUTTONS):
         wxRemotelyScrolledTreeCtrl.__init__(self, parent, ID, pos, size, style)
     def __init__(self, parent, ID, pos=wxDefaultPosition, size=wxDefaultSize,
                  style=wxTR_HAS_BUTTONS):
         wxRemotelyScrolledTreeCtrl.__init__(self, parent, ID, pos, size, style)

-        self.SetBackgroundColour("LIGHT BLUE")

 
         # make an image list
 
         # make an image list

+        im1 = im2 = -1

         self.il = wxImageList(16, 16)
         self.il = wxImageList(16, 16)

-        im1 = self.il.AddIcon(wxIconFromXPMData(images.getFolder1Data()))
-        im2 = self.il.AddIcon(wxIconFromXPMData(images.getFile1Data()))
+        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)
 


@@ -31,6 +32,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):


@@ -42,6 +47,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+1)

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


@@ -56,26 +65,37 @@ class TestPanel(wxPanel):
         wxPanel.__init__(self, parent, -1)
         self.log = log
 
         wxPanel.__init__(self, parent, -1)
         self.log = log
 

-        scroller = wxSplitterScrolledWindow(self, -1, (50,50), (350, 250),
+        scroller = wxSplitterScrolledWindow(self, -1, #(50,50), (350, 250),

                                       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)
+        tree = TestTree(splitter, -1, style = wxTR_HAS_BUTTONS |
+                                              wxTR_NO_LINES |
+                                              wxTR_ROW_LINES |
+                                              #wxTR_HIDE_ROOT |
+                                              wxNO_BORDER )

         valueWindow = TestValueWindow(splitter, -1, style=wxNO_BORDER)
 
         valueWindow = TestValueWindow(splitter, -1, style=wxNO_BORDER)
 

-        splitter.SplitVertically(self.tree, valueWindow)
-        splitter.SetSashPosition(150)
-        scroller.SetTargetWindow(self.tree)
-        scroller.EnableScrolling(FALSE, FALSE)
+        splitter.SplitVertically(tree, valueWindow, 150)
+        scroller.SetTargetWindow(tree)
+        scroller.EnableScrolling(False, False)

 
 

-        valueWindow.SetTreeCtrl(self.tree)
-        self.tree.SetCompanionWindow(valueWindow)
+        valueWindow.SetTreeCtrl(tree)
+        tree.SetCompanionWindow(valueWindow)

 
 

+        sizer = wxBoxSizer(wxVERTICAL)
+        sizer.Add(scroller, 1, wxEXPAND|wxALL, 25)
+        self.SetAutoLayout(True)
+        self.SetSizer(sizer)

 
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):

+    if wxPlatform == "__WXMAC__":
+        wxMessageBox("This demo currently fails on the Mac. The problem is being looked into...", "Sorry")
+        return
+

     win = TestPanel(nb, log)
     return win
 
     win = TestPanel(nb, log)
     return win
 


@@ -95,3 +115,9 @@ also be useful by themselves.
 """
 
 
 """
 
 

+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+