another merge from WX_2_6_BRANCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3,8 +3,6 @@ import wx
|
||||
import wx.media
|
||||
import os
|
||||
|
||||
from Main import opj
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
class TestPanel(wx.Panel):
|
||||
@@ -34,6 +32,7 @@ class TestPanel(wx.Panel):
|
||||
|
||||
slider = wx.Slider(self, -1, 0, 0, 0)
|
||||
self.slider = slider
|
||||
slider.SetMinSize((150, -1))
|
||||
self.Bind(wx.EVT_SLIDER, self.OnSeek, slider)
|
||||
|
||||
self.st_size = wx.StaticText(self, -1, size=(100,-1))
|
||||
@@ -54,7 +53,7 @@ class TestPanel(wx.Panel):
|
||||
sizer.Add(self.st_pos, (3, 5))
|
||||
self.SetSizer(sizer)
|
||||
|
||||
self.DoLoadFile(opj("data/testmovie.mpg"))
|
||||
self.DoLoadFile(os.path.abspath("data/testmovie.mpg"))
|
||||
self.mc.Stop()
|
||||
|
||||
self.timer = wx.Timer(self)
|
||||
@@ -81,8 +80,8 @@ class TestPanel(wx.Panel):
|
||||
else:
|
||||
self.mc.SetBestFittingSize()
|
||||
self.GetSizer().Layout()
|
||||
self.slider.SetRange(0, self.mc.Length())
|
||||
self.mc.Play()
|
||||
self.slider.SetRange(0, self.mc.Length())
|
||||
|
||||
|
||||
def OnPlay(self, evt):
|
||||
|
Reference in New Issue
Block a user