modifications to URL<->filename conversion: take wxFileName, rename

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

diff --git a/wxPython/demo/wxWave.py b/wxPython/demo/wxWave.py
index 880d871bc7ef89c509ecee50ac63122b5aa38118..7d60ac09c4c600a3843c02b1c615c0ff6f62949a 100644 (file)
--- a/wxPython/demo/wxWave.py
+++ b/wxPython/demo/wxWave.py
@@ -1,5 +1,6 @@
 
 from wxPython.wx import *
+from Main import opj
 
 #----------------------------------------------------------------------
 
@@ -7,17 +8,24 @@ class TestPanel(wxPanel):
     def __init__(self, parent):
         wxPanel.__init__(self, parent, -1)
 
-        b = wxButton(self, -1, "Play Sound", (25, 25))
-        EVT_BUTTON(self, b.GetId(), self.OnButton)
+        b = wxButton(self, -1, "Play Sound 1", (25, 25))
+        EVT_BUTTON(self, b.GetId(), self.OnButton1)
 
+        b = wxButton(self, -1, "Play Sound 2", (25, 65))
+        EVT_BUTTON(self, b.GetId(), self.OnButton2)
 
-    def OnButton(self, evt):
+
+    def OnButton1(self, evt):
+        try:
+            wave = wxWave(opj('data/anykey.wav'))
+            wave.Play()
+        except NotImplementedError, v:
+            wxMessageBox(str(v), "Exception Message")
+
+
+    def OnButton2(self, evt):
         try:
-            import time
-            if int(time.time()) % 2 == 1:
-                wave = wxWave('data/anykey.wav')
-            else:
-                wave = wxWave('data/plan.wav')
+            wave = wxWave(opj('data/plan.wav'))
             wave.Play()
         except NotImplementedError, v:
             wxMessageBox(str(v), "Exception Message")