more demo updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index bb768b7c60425b05e816aba04893524f3ea62d17..0605fa36faca2d98ba683509950c0e9d41a5520c 100644 (file)
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -29,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-2002.</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>
@@ -48,6 +48,8 @@ demo item so you can learn how to use the classes yourself.</p>
         html = wxHtmlWindow(self, -1, size=(420, -1))
         py_version = string.split(sys.version)[0]
         html.SetPage(self.text % (wx.__version__, py_version))
+        btn = html.FindWindowById(wxID_OK)
+        btn.SetDefault()
         ir = html.GetInternalRepresentation()
         html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
         self.SetClientSize(html.GetSize())

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index e5b804fc3d9492607686ed1b6cc70e46ba308b68..2fde4eadc1fe82f0025b5bb61fdd2e52ad9c018b 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -15,7 +15,7 @@ import sys, os, time, string
 from   wxPython.wx import *
 from   wxPython.html import wxHtmlWindow
 
-from wxPython.stc import *
+##from wxPython.stc import *
 
 import images
 

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index c11f30d23bf401b50f273c6c869491c690e47abd..ff7d34fd828af167cec34d3ea7bff2e3bd2d0c5a 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -332,14 +332,18 @@ be helpful.
 """
 
 
-if __name__ == '__main__':
-    import sys
-    app = wxPySimpleApp()
-    frame = wxFrame(None, -1, "Tester...", size=(640, 480))
-    win = runTest(frame, frame, sys.stdout)
-    frame.Show(true)
-    app.MainLoop()
+## if __name__ == '__main__':
+##     import sys
+##     app = wxPySimpleApp()
+##     frame = wxFrame(None, -1, "Tester...", size=(640, 480))
+##     win = runTest(frame, frame, sys.stdout)
+##     frame.Show(true)
+##     app.MainLoop()
+
 
+if __name__ == '__main__':
+    import run
+    run.main(['', 'wxStyledTextCtrl_2'])