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

use more wxOVERRIDE (#329)

Browse Source
This commit is contained in:
Maarten
2016-09-25 22:21:28 +02:00
committed by paulcor
parent d0c57dbef0
commit 977a826639
66 changed files with 456 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/msw/mediactrl_am.cpp
View File

@@ -839,44 +839,44 @@ 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 wxURI& location, const wxURI& proxy);
virtual bool Load(const wxString& fileName) wxOVERRIDE;
virtual bool Load(const wxURI& location) wxOVERRIDE;
virtual bool Load(const wxURI& location, const wxURI& proxy) wxOVERRIDE;
bool DoLoad(const wxString& location);
void FinishLoad();
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);
virtual double GetPlaybackRate() wxOVERRIDE;
virtual bool SetPlaybackRate(double) wxOVERRIDE;
virtual double GetVolume();
virtual bool SetVolume(double);
virtual double GetVolume() wxOVERRIDE;
virtual bool SetVolume(double) wxOVERRIDE;
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags);
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE;
void DoGetDownloadProgress(wxLongLong*, wxLongLong*);
virtual wxLongLong GetDownloadProgress()
virtual wxLongLong GetDownloadProgress() wxOVERRIDE
{
wxLongLong progress, total;
DoGetDownloadProgress(&progress, &total);
return progress;
}
virtual wxLongLong GetDownloadTotal()
virtual wxLongLong GetDownloadTotal() wxOVERRIDE
{
wxLongLong progress, total;
DoGetDownloadProgress(&progress, &total);