wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

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

diff --git a/wxPython/demo/PyCrust.py b/wxPython/demo/PyCrust.py
index 4d2ae22b32d3a29369e4462772443830d7b47deb..5bf452e2cc0393ad47ba3cd8b061998948cff66b 100644 (file)
--- a/wxPython/demo/PyCrust.py
+++ b/wxPython/demo/PyCrust.py
@@ -1,20 +1,18 @@
 
 

-
-from wxPython.lib.PyCrust import shell, version
+from wx import py

 
 
 #----------------------------------------------------------------------
 
 
 
 #----------------------------------------------------------------------
 

-intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % version.VERSION
+intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % py.version.VERSION

 
 def runTest(frame, nb, log):
 
 def runTest(frame, nb, log):

-    win = shell.Shell(nb, -1, introText=intro)
+    win = py.crust.Crust(nb, intro=intro)

     return win
 
 #----------------------------------------------------------------------
 
     return win
 
 #----------------------------------------------------------------------
 

-overview = shell.__doc__
-
+overview = py.filling.__doc__ + "\n\n" + py.crust.__doc__

 
 if __name__ == '__main__':
     import sys,os
 
 if __name__ == '__main__':
     import sys,os