X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca4fef106b8327e2e55636de3f68a511a4c392..a97cefbabff29c566c0859d3e735c79a6f3032b6:/wxPython/demo/SplitTree.py diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py index da4156b47a..07884d9445 100644 --- a/wxPython/demo/SplitTree.py +++ b/wxPython/demo/SplitTree.py @@ -73,19 +73,19 @@ class TestValueWindow(gizmos.TreeCompanionWindow): dc.SetPen(pen) dc.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID)) - dc.DrawRectangle((rect.x, rect.y), (rect.width+1, rect.height+1)) + dc.DrawRectangle(rect.x, rect.y, rect.width+1, rect.height+1) dc.SetTextForeground("BLACK") dc.SetBackgroundMode(wx.TRANSPARENT) tw, th = dc.GetTextExtent(text) x = 5 y = rect.y + max(0, (rect.height - th) / 2) - dc.DrawText(text, (x, y)) + dc.DrawText(text, x, y) class TestPanel(wx.Panel): def __init__(self, parent, log): - wx.Panel.__init__(self, parent, -1) + wx.Panel.__init__(self, parent, -1, size=(640,480)) self.log = log scroller = gizmos.SplitterScrolledWindow( @@ -105,7 +105,7 @@ class TestPanel(wx.Panel): valueWindow = TestValueWindow(splitter, style=wx.NO_BORDER) - splitter.SplitVertically(tree, valueWindow, 150) + wx.CallAfter(splitter.SplitVertically, tree, valueWindow, 150) scroller.SetTargetWindow(tree) scroller.EnableScrolling(False, False) @@ -114,16 +114,17 @@ class TestPanel(wx.Panel): sizer = wx.BoxSizer(wx.VERTICAL) sizer.Add(scroller, 1, wx.EXPAND|wx.ALL, 25) - self.SetAutoLayout(True) self.SetSizer(sizer) - + self.Layout() #---------------------------------------------------------------------- def runTest(frame, nb, log): if wx.Platform == "__WXMAC__": - wx.MessageBox("This demo currently fails on the Mac. The problem is being looked into...", "Sorry") - return + from Main import MessagePanel + win = MessagePanel(nb, 'This demo currently fails on the Mac. The problem is being looked into...', + 'Sorry', wx.ICON_WARNING) + return win win = TestPanel(nb, log) return win