From: Ryan Norton Date: Wed, 24 Nov 2004 19:15:27 +0000 (+0000) Subject: prevent function hiding - move NextBackend into protected X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/973dc0a8ee8f513badbb51d5e649c359c003d60f prevent function hiding - move NextBackend into protected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index 5acd9490d8..7994c83ea2 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -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;