Demo updates for new wx namespace, from Jeff Grimmett

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

diff --git a/wxPython/demo/wxWave.py b/wxPython/demo/wxWave.py
index 3be8f9e71575bcd4db4cf2a07c522e5820ea823d..b84e62148bd784d2d71032ffe5c2f20b5df5e787 100644 (file)
--- a/wxPython/demo/wxWave.py
+++ b/wxPython/demo/wxWave.py
@@ -1,28 +1,39 @@
+# 11/22/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
+
+import  wx
 
-from wxPython.wx import *
 from Main import opj
 
 #----------------------------------------------------------------------
 
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent):
-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Play Sound 1", (25, 25))
+        self.Bind(wx.EVT_BUTTON, self.OnButton1, b)
 
-        b = wxButton(self, -1, "Play Sound", (25, 25))
-        EVT_BUTTON(self, b.GetId(), self.OnButton)
+        b = wx.Button(self, -1, "Play Sound 2", (25, 65))
+        self.Bind(wx.EVT_BUTTON, self.OnButton2, b)
 
 
-    def OnButton(self, evt):
+    def OnButton1(self, evt):
         try:
-            import time
-            if int(time.time()) % 2 == 1:
-                wave = wxWave(opj('data/anykey.wav'))
-            else:
-                wave = wxWave(opj('data/plan.wav'))
+            wave = wx.Wave(opj('data/anykey.wav'))
             wave.Play()
         except NotImplementedError, v:
-            wxMessageBox(str(v), "Exception Message")
+            wx.MessageBox(str(v), "Exception Message")
+
 
+    def OnButton2(self, evt):
+        try:
+            wave = wx.Wave(opj('data/plan.wav'))
+            wave.Play()
+        except NotImplementedError, v:
+            wx.MessageBox(str(v), "Exception Message")
 
 #----------------------------------------------------------------------
 
@@ -34,4 +45,17 @@ def runTest(frame, nb, log):
 
 
 overview = """\
+This class represents a short wave file, in Windows WAV format, that can 
+be stored in memory and played. Currently this class is implemented on Windows 
+and GTK (Linux) only.
+
+This demo offers two examples, both driven by buttons, but obviously the event
+that drives the playing of the sound can come from anywhere.
+
 """
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])