Stop the timer when the demo is shutdown

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

diff --git a/wxPython/demo/infoframe.py b/wxPython/demo/infoframe.py
index aeea24411f34e5abef27df15bb3d9c35fd35c27b..14d744b8743f4869f8be5eb45f8805d3d408ca2d 100644 (file)
--- a/wxPython/demo/infoframe.py
+++ b/wxPython/demo/infoframe.py
@@ -1,18 +1,8 @@
-# 11/12/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# o wx module doesn't like the doc string.
-#
-# 11/25/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Library didn't get hit by the wx renamer.
-# o Docstring issues resolved.
-#
 
 import  sys
 
 import  wx
-import  wx.lib.infoframe as infoframe
+import  wx.lib.infoframe
 
 #----------------------------------------------------------------------
 
@@ -82,14 +72,14 @@ class MyFrame(wx.Frame):
 
 #----------------------------------------------------------------------
 
-overview = infoframe.__doc__
+overview = wx.lib.infoframe.__doc__
 
 def runTest(frame, nb, log):
     """
     This method is used by the wxPython Demo Framework for integrating
     this demo with the rest.
     """
-    win = MyFrame(infoframe.wxPyInformationalMessagesFrame())
+    win = MyFrame(wx.lib.infoframe.PyInformationalMessagesFrame())
     frame.otherWin = win
     win.Show(1)
 
@@ -113,7 +103,7 @@ if __name__ == "__main__":
 ##             output.SetOtherMenuBar(menubar,menuname="Output")
 
 ##         def OnClose(self,event):
-##             if isinstance(sys.stdout,wxPyInformationalMessagesFrame):
+##             if isinstance(sys.stdout,wx.lib.infoframe.PyInformationalMessagesFrame):
 ##                 sys.stdout.close()
 ##             self.Destroy()
 
@@ -121,7 +111,7 @@ if __name__ == "__main__":
         
         # Override the default output window and point it to the
         # custom class.
-        outputWindowClass = infoframe.wxPyInformationalMessagesFrame
+        outputWindowClass = wx.lib.infoframe.PyInformationalMessagesFrame
         
         def OnInit(self):
             
@@ -142,7 +132,7 @@ if __name__ == "__main__":
             self.SetTopWindow(frame)
             
             # Associate the frame with stdout.
-            if isinstance(sys.stdout, infoframe.wxPyInformationalMessagesFrame):
+            if isinstance(sys.stdout, wx.lib.infoframe.PyInformationalMessagesFrame):
                 sys.stdout.SetParent(frame)
 
             print "Starting.\n",