]> git.saurik.com Git - wxWidgets.git/commitdiff
prevent function hiding - move NextBackend into protected
authorRyan Norton <wxprojects@comcast.net>
Wed, 24 Nov 2004 19:15:27 +0000 (19:15 +0000)
committerRyan Norton <wxprojects@comcast.net>
Wed, 24 Nov 2004 19:15:27 +0000 (19:15 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mediactrl.h

index 5acd9490d8126035eaa97c6fb6adeca3f4434e6e..7994c83ea210f96c417bfeaf0f2c3492a453af91 100644 (file)
@@ -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;