prevent function hiding - move NextBackend into protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b5093969a2
commit
973dc0a8ee
@ -169,9 +169,6 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxT("mediaCtrl"));
|
||||
|
||||
static wxClassInfo* NextBackend();
|
||||
|
||||
|
||||
bool Play();
|
||||
bool Pause();
|
||||
bool Stop();
|
||||
@ -191,7 +188,16 @@ public:
|
||||
wxLongLong GetPosition();
|
||||
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:
|
||||
static wxClassInfo* NextBackend();
|
||||
|
||||
void OnMediaFinished(wxMediaEvent& evt);
|
||||
virtual void DoMoveWindow(int x, int y, int w, int h);
|
||||
wxSize DoGetBestSize() const;
|
||||
|
Loading…
Reference in New Issue
Block a user