fixed array tests compilation and a bug in obj array test

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

diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index 7e9827675e25ff335cd0af6ce6d8233bfcd62f9f..bb768b7c60425b05e816aba04893524f3ea62d17 100644 (file)
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -1,3 +1,4 @@
+import sys, string
 
 from   wxPython.wx       import *
 from   wxPython.html     import *
@@ -12,7 +13,10 @@ class MyAboutBox(wxDialog):
 <center><table bgcolor="#458154" width="100%%" cellspacing="0"
 cellpadding="0" border="1">
 <tr>
-    <td align="center"><h1>wxPython %s</h1></td>
+    <td align="center">
+    <h1>wxPython %s</h1>
+    Running on Python %s<br>
+    </td>
 </tr>
 </table>
 
@@ -25,7 +29,7 @@ sit back and enjoy.  Be sure to take a peek at the source code for each
 demo item so you can learn how to use the classes yourself.</p>
 
 <p><b>wxPython</b> is brought to you by <b>Robin Dunn</b> and<br>
-<b>Total Control Software</b>, Copyright (c) 1997-1999.</p>
+<b>Total Control Software</b>, Copyright (c) 1997-2002.</p>
 
 <p>
 <font size="-1">Please see <i>license.txt</i> for licensing information.</font>
@@ -40,19 +44,13 @@ demo item so you can learn how to use the classes yourself.</p>
 </html>
 '''
     def __init__(self, parent):
-        wxDialog.__init__(self, parent, -1, 'About the wxPython demo',
-                          size=wxSize(420, 380))
-        self.html = wxHtmlWindow(self, -1)
-        self.html.SetPage(self.text % wx.__version__)
-        self.SetAutoLayout(true)
-        lc = wxLayoutConstraints()
-        lc.top.SameAs(self, wxTop, 5)
-        lc.left.SameAs(self, wxLeft, 5)
-        lc.bottom.SameAs(self, wxBottom, 5)
-        lc.right.SameAs(self, wxRight, 5)
-        self.html.SetConstraints(lc)
-        self.Layout()
-
+        wxDialog.__init__(self, parent, -1, 'About the wxPython demo',)
+        html = wxHtmlWindow(self, -1, size=(420, -1))
+        py_version = string.split(sys.version)[0]
+        html.SetPage(self.text % (wx.__version__, py_version))
+        ir = html.GetInternalRepresentation()
+        html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
+        self.SetClientSize(html.GetSize())
         self.CentreOnParent(wxBOTH)
 
 #---------------------------------------------------------------------------