Use close button used in wxMiniFrame.

[wxWidgets.git] / wxPython / demo / About.py
diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py

index ab36a5428aa198632c85f3edb8d0e79bf9c41706..db49ecad94bff5cdc29f8cf2bd652ddcd5ebe93f 100644 (file)
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -1,18 +1,23 @@
+import sys
  
  
-from   wxPython.wx       import *
-from   wxPython.html     import *
-import wxPython.lib.wxpTag
+import wx                  # This module uses the new wx namespace
+import wx.html
+import wx.lib.wxpTag
  
  #---------------------------------------------------------------------------
  
  
  #---------------------------------------------------------------------------
  
-class MyAboutBox(wxDialog):
+class MyAboutBox(wx.Dialog):
      text = '''
  <html>
  <body bgcolor="#AC76DE">
  <center><table bgcolor="#458154" width="100%%" cellspacing="0"
  cellpadding="0" border="1">
  <tr>
      text = '''
  <html>
  <body bgcolor="#AC76DE">
  <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>
+    (%s)<br>
+    Running on Python %s<br>
+    </td>
  </tr>
  </table>
  
  </tr>
  </table>
  
@@ -25,40 +30,45 @@ 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-2000.</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>
  
  
  <p>
  <font size="-1">Please see <i>license.txt</i> for licensing information.</font>
  </p>
  
-<p><wxp class="wxButton">
+<p><wxp module="wx" class="Button">
      <param name="label" value="Okay">
      <param name="label" value="Okay">
-    <param name="id"    value="wxID_OK">
+    <param name="id"    value="ID_OK">
  </wxp></p>
  </center>
  </body>
  </html>
  '''
      def __init__(self, parent):
  </wxp></p>
  </center>
  </body>
  </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()
-
-        self.CentreOnParent(wxBOTH)
+        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]
+        txt = self.text % (wx.VERSION_STRING,
+                           ", ".join(wx.PlatformInfo[1:]),
+                           py_version
+                           )
+        html.SetPage(txt)
+        btn = html.FindWindowById(wx.ID_OK)
+        ir = html.GetInternalRepresentation()
+        html.SetSize( (ir.GetWidth()+25, ir.GetHeight()+25) )
+        self.SetClientSize(html.GetSize())
+        self.CentreOnParent(wx.BOTH)
  
  #---------------------------------------------------------------------------
  
  
  
  
  #---------------------------------------------------------------------------
  
  
  
-
-
+if __name__ == '__main__':
+    app = wx.PySimpleApp()
+    dlg = MyAboutBox(None)
+    dlg.ShowModal()
+    dlg.Destroy()
+    app.MainLoop()