X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07c99b2608704fd8216760040d6f90db1a4842a1..72858fcf67bf670ea18fe48a6b039d61afa87131:/wxPython/demo/SplitTree.py?ds=inline

diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index ed3cc5e5fd..698d2f639d 100644
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -9,7 +9,6 @@ class TestTree(wxRemotelyScrolledTreeCtrl):
     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
         im1 = im2 = -1
@@ -51,7 +50,7 @@ class TestValueWindow(wxTreeCompanionWindow):
             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.DrawRectangle(rect.x, rect.y, rect.width+1, rect.height+1)
             dc.SetTextForeground("BLACK")
             dc.SetBackgroundMode(wxTRANSPARENT)
             tw, th = dc.GetTextExtent(text)
@@ -66,27 +65,37 @@ class TestPanel(wxPanel):
         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)
-        self.tree = TestTree(splitter, -1, style =
-                             wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_ROW_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)
 
-        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):
+    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
 
@@ -106,3 +115,9 @@ also be useful by themselves.
 """
 
 
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+