Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/unix/mediactrl.cpp
View File

@@ -154,36 +154,36 @@ public:
const wxSize& size,
long style,
const wxValidator& validator,
const wxString& name);
const wxString& name) wxOVERRIDE;
virtual bool Play();
virtual bool Pause();
virtual bool Stop();
virtual bool Play() wxOVERRIDE;
virtual bool Pause() wxOVERRIDE;
virtual bool Stop() wxOVERRIDE;
virtual bool Load(const wxString& fileName);
virtual bool Load(const wxURI& location);
virtual bool Load(const wxString& fileName) wxOVERRIDE;
virtual bool Load(const wxURI& location) wxOVERRIDE;
virtual bool Load(const wxURI& location,
const wxURI& proxy)
const wxURI& proxy) wxOVERRIDE
{ return wxMediaBackendCommonBase::Load(location, proxy); }
virtual wxMediaState GetState();
virtual wxMediaState GetState() wxOVERRIDE;
virtual bool SetPosition(wxLongLong where);
virtual wxLongLong GetPosition();
virtual wxLongLong GetDuration();
virtual bool SetPosition(wxLongLong where) wxOVERRIDE;
virtual wxLongLong GetPosition() wxOVERRIDE;
virtual wxLongLong GetDuration() wxOVERRIDE;
virtual void Move(int x, int y, int w, int h);
wxSize GetVideoSize() const;
virtual void Move(int x, int y, int w, int h) wxOVERRIDE;
wxSize GetVideoSize() const wxOVERRIDE;
virtual double GetPlaybackRate();
virtual bool SetPlaybackRate(double dRate);
virtual double GetPlaybackRate() wxOVERRIDE;
virtual bool SetPlaybackRate(double dRate) wxOVERRIDE;
virtual wxLongLong GetDownloadProgress();
virtual wxLongLong GetDownloadTotal();
virtual wxLongLong GetDownloadProgress() wxOVERRIDE;
virtual wxLongLong GetDownloadTotal() wxOVERRIDE;
virtual bool SetVolume(double dVolume);
virtual double GetVolume();
virtual bool SetVolume(double dVolume) wxOVERRIDE;
virtual double GetVolume() wxOVERRIDE;
//------------implementation from now on-----------------------------------
bool CheckForErrors();