removed unused APPEND_STR macro

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

diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index 73e0447114fcc52aa2cc0435d7f0a2c733ca8d8b..db49ecad94bff5cdc29f8cf2bd652ddcd5ebe93f 100644 (file)
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -15,6 +15,7 @@ cellpadding="0" border="1">
 <tr>
     <td align="center">
     <h1>wxPython %s</h1>
 <tr>
     <td align="center">
     <h1>wxPython %s</h1>

+    (%s)<br>

     Running on Python %s<br>
     </td>
 </tr>
     Running on Python %s<br>
     </td>
 </tr>


@@ -29,7 +30,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>
 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-2003.</p>
+<b>Total Control Software,</b> Copyright (c) 1997-2006.</p>

 
 <p>
 <font size="-1">Please see <i>license.txt</i> for licensing information.</font>
 
 <p>
 <font size="-1">Please see <i>license.txt</i> for licensing information.</font>


@@ -46,10 +47,15 @@ demo item so you can learn how to use the classes yourself.</p>
     def __init__(self, parent):
         wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
         html = wx.html.HtmlWindow(self, -1, size=(420, -1))
     def __init__(self, parent):
         wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
         html = wx.html.HtmlWindow(self, -1, size=(420, -1))

+        if "gtk2" in wx.PlatformInfo:
+            html.SetStandardFonts()

         py_version = sys.version.split()[0]
         py_version = sys.version.split()[0]

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

         btn = html.FindWindowById(wx.ID_OK)
         btn = html.FindWindowById(wx.ID_OK)

-        ##btn.SetDefault()

         ir = html.GetInternalRepresentation()
         html.SetSize( (ir.GetWidth()+25, ir.GetHeight()+25) )
         self.SetClientSize(html.GetSize())
         ir = html.GetInternalRepresentation()
         html.SetSize( (ir.GetWidth()+25, ir.GetHeight()+25) )
         self.SetClientSize(html.GetSize())