wxUSE_*BOOK checks.

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

diff --git a/wxPython/demo/ToolBar.py b/wxPython/demo/ToolBar.py
index 7707de09dea7cb0a8c20a4195dd4fe7ada541ee8..6589abf20f953c359df4916956ced439cb41d4ea 100644 (file)
--- a/wxPython/demo/ToolBar.py
+++ b/wxPython/demo/ToolBar.py
@@ -118,15 +118,32 @@ class TestToolBar(wx.Frame):
 
 #---------------------------------------------------------------------------
 
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Show the ToolBar sample", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        win = TestToolBar(self, self.log)
+        win.Show(True)
+
+
+#---------------------------------------------------------------------------
+
+
 def runTest(frame, nb, log):
-    win = TestToolBar(frame, log)
-    frame.otherWin = win
-    win.Show(True)
+    win = TestPanel(nb, log)
+    return win
 
 #---------------------------------------------------------------------------
 
 
 
+
 overview = """\
 wx.ToolBar is a narrow strip of icons on one side of a frame (top, bottom, sides)
 that acts much like a menu does, except it is always visible. Additionally, actual
@@ -160,5 +177,5 @@ is provided in wx.lib.floatbar, but it is not formally supported.
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])