'[1219035] cleanup: miscellaneous' and minor source cleaning.

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

diff --git a/wxPython/demo/MediaCtrl.py b/wxPython/demo/MediaCtrl.py
index 24f333507de9dd43929b8ec7cb93d7c6e804d52a..3c0f6c39b0c271759b596a84c7eafc26ebbc631f 100644 (file)
--- a/wxPython/demo/MediaCtrl.py
+++ b/wxPython/demo/MediaCtrl.py
@@ -14,7 +14,11 @@ class TestPanel(wx.Panel):
                           style=wx.TAB_TRAVERSAL|wx.CLIP_CHILDREN)
 
         # Create some controls
                           style=wx.TAB_TRAVERSAL|wx.CLIP_CHILDREN)
 
         # Create some controls

-        self.mc = wx.media.MediaCtrl(self, style=wx.SIMPLE_BORDER)
+        try:
+            self.mc = wx.media.MediaCtrl(self, style=wx.SIMPLE_BORDER)
+        except NotImplementedError:
+            self.Destroy()
+            raise

 
         btn1 = wx.Button(self, -1, "Load File")
         self.Bind(wx.EVT_BUTTON, self.OnLoadFile, btn1)
 
         btn1 = wx.Button(self, -1, "Load File")
         self.Bind(wx.EVT_BUTTON, self.OnLoadFile, btn1)


@@ -28,9 +32,6 @@ class TestPanel(wx.Panel):
         btn4 = wx.Button(self, -1, "Stop")
         self.Bind(wx.EVT_BUTTON, self.OnStop, btn4)
 
         btn4 = wx.Button(self, -1, "Stop")
         self.Bind(wx.EVT_BUTTON, self.OnStop, btn4)
 

-        btn5 = wx.ToggleButton(self, -1, "Loop")
-        self.Bind(wx.EVT_TOGGLEBUTTON, self.OnLoopToggle, btn5)
-

         slider = wx.Slider(self, -1, 0, 0, 0)
         self.slider = slider
         self.Bind(wx.EVT_SLIDER, self.OnSeek, slider)
         slider = wx.Slider(self, -1, 0, 0, 0)
         self.slider = slider
         self.Bind(wx.EVT_SLIDER, self.OnSeek, slider)


@@ -47,7 +48,6 @@ class TestPanel(wx.Panel):
         sizer.Add(btn2, (2,3))
         sizer.Add(btn3, (3,3))
         sizer.Add(btn4, (4,3))
         sizer.Add(btn2, (2,3))
         sizer.Add(btn3, (3,3))
         sizer.Add(btn4, (4,3))

-        sizer.Add(btn5, (5,3))

         sizer.Add(slider, (6,1), flag=wx.EXPAND)
         sizer.Add(self.st_size, (1, 5))
         sizer.Add(self.st_len,  (2, 5))
         sizer.Add(slider, (6,1), flag=wx.EXPAND)
         sizer.Add(self.st_size, (1, 5))
         sizer.Add(self.st_len,  (2, 5))


@@ -85,11 +85,6 @@ class TestPanel(wx.Panel):
             self.mc.Play()
         
     
             self.mc.Play()
         
     

-    def OnLoopToggle(self, evt):
-        btn = evt.GetEventObject()
-        self.mc.Loop(btn.GetValue())
-                     
-    

     def OnPlay(self, evt):
         self.mc.Play()
     
     def OnPlay(self, evt):
         self.mc.Play()