X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..e3f9e20cb15c62bd347a8e52d2d36529adbdb3d6:/wxPython/demo/About.py
diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index 3e22739553..73e0447114 100644
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -1,12 +1,12 @@
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">
@@ -29,36 +29,40 @@ 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-2002.</p>
+<b>Total Control Software,</b> Copyright (c) 1997-2003.</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="id" value="wxID_OK">
+ <param name="id" value="ID_OK">
</wxp></p>
</center>
</body>
</html>
'''
def __init__(self, parent):
- wxDialog.__init__(self, parent, -1, 'About the wxPython demo',)
- html = wxHtmlWindow(self, -1, size=(420, -1))
+ wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
+ html = wx.html.HtmlWindow(self, -1, size=(420, -1))
py_version = sys.version.split()[0]
- html.SetPage(self.text % (wx.__version__, py_version))
- btn = html.FindWindowById(wxID_OK)
- btn.SetDefault()
+ html.SetPage(self.text % (wx.VERSION_STRING, py_version))
+ btn = html.FindWindowById(wx.ID_OK)
+ ##btn.SetDefault()
ir = html.GetInternalRepresentation()
html.SetSize( (ir.GetWidth()+25, ir.GetHeight()+25) )
self.SetClientSize(html.GetSize())
- self.CentreOnParent(wxBOTH)
+ self.CentreOnParent(wx.BOTH)
#---------------------------------------------------------------------------
-
-
+if __name__ == '__main__':
+ app = wx.PySimpleApp()
+ dlg = MyAboutBox(None)
+ dlg.ShowModal()
+ dlg.Destroy()
+ app.MainLoop()