adjusting to changes in xti.h

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

diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index a7abb1ab9ba3e830f7da6758265e2a2b8a7d1371..698d2f639d1e979a139d607d7bae6907c5d701ce 100644 (file)
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -65,29 +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)
         tree = TestTree(splitter, -1, style = wxTR_HAS_BUTTONS |
                                               wxTR_NO_LINES |
                                               wxTR_ROW_LINES |
                                       style=wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL)
         splitter = wxThinSplitterWindow(scroller, -1, style=wxSP_3DBORDER | wxCLIP_CHILDREN)
         splitter.SetSashSize(2)
         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)
 
                                               wxNO_BORDER )
         valueWindow = TestValueWindow(splitter, -1, style=wxNO_BORDER)
 

-        splitter.SplitVertically(tree, valueWindow)
-        splitter.SetSashPosition(150)
+        splitter.SplitVertically(tree, valueWindow, 150)

         scroller.SetTargetWindow(tree)
         scroller.SetTargetWindow(tree)

-        scroller.EnableScrolling(FALSE, FALSE)
+        scroller.EnableScrolling(False, False)

 
         valueWindow.SetTreeCtrl(tree)
         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
 


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

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