Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as

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

diff --git a/wxPython/demo/widgetTest.py b/wxPython/demo/widgetTest.py
index 052b3ed8e88a987f9ad429f0a67914c4cef20401..73b962f73c03da6b4c8321639131162d99788fa5 100644 (file)
--- a/wxPython/demo/widgetTest.py
+++ b/wxPython/demo/widgetTest.py
@@ -49,7 +49,10 @@ class TestHtmlPanel(wx.Panel):
         wx.Panel.__init__(self, parent, id, size=size)
         self.html = html.HtmlWindow(self, -1, (5,5), (400, 350))
         py_version = sys.version.split()[0]
         wx.Panel.__init__(self, parent, id, size=size)
         self.html = html.HtmlWindow(self, -1, (5,5), (400, 350))
         py_version = sys.version.split()[0]

-        self.html.SetPage(About.MyAboutBox.text % (wx.VERSION_STRING, py_version))
+        self.html.SetPage(About.MyAboutBox.text %
+                          (wx.VERSION_STRING,
+                           ", ".join(wx.PlatformInfo[1:]),
+                           py_version))

         ir = self.html.GetInternalRepresentation()
         self.html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
         self.Fit()
         ir = self.html.GetInternalRepresentation()
         self.html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
         self.Fit()


@@ -65,5 +68,5 @@ def runTest(frame, nb, log):
 if __name__ == '__main__':
     import sys,os
     import run
 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:])