Include fix.

[wxWidgets.git] / include / wx / mediactrl.h

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 0001daa6a721d82573da57cbf1c943f7ed29e517..7994c83ea210f96c417bfeaf0f2c3492a453af91 100644 (file)
--- 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;
@@ -270,8 +276,8 @@ public:
 #define wxMEDIA_STOP_ID    13001
 
 //Define our event types - we need to call DEFINE_EVENT_TYPE(EVT) later
-DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
-DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID)
+DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
+DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STOP,     wxMEDIA_STOP_ID)
 
 //Function type(s) our events need
 typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&);