AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prevent function hiding - move NextBackend into protected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2004-11-24 19:15:27 +00:00
parent b5093969a2
commit 973dc0a8ee
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/mediactrl.h
View File

@ -169,9 +169,6 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("mediaCtrl")); const wxString& name = wxT("mediaCtrl"));
static wxClassInfo* NextBackend();
bool Play(); bool Play();
bool Pause(); bool Pause();
bool Stop(); bool Stop();
@ -191,7 +188,16 @@ public:
wxLongLong GetPosition(); wxLongLong GetPosition();
wxLongLong GetDuration(); wxLongLong GetDuration();
//The following two prevent function hiding
void GetPosition(int* x, int* y) const
{ wxControl::GetPosition(x, y); }
wxPoint GetPosition() const
{ return wxControl::GetPosition(); }
protected: protected:
static wxClassInfo* NextBackend();
void OnMediaFinished(wxMediaEvent& evt); void OnMediaFinished(wxMediaEvent& evt);
virtual void DoMoveWindow(int x, int y, int w, int h); virtual void DoMoveWindow(int x, int y, int w, int h);
wxSize DoGetBestSize() const; wxSize DoGetBestSize() const;