always properly check if SeekI() calls succeded; this makes CanRead() functions of...

[wxWidgets.git] / src / common / mediactrlcmn.cpp

diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 6120cada491a7cebc59b3a9affa3c072d0d0838e..79e6799352b7a2ced070b34f03f87dfde25ccf47 100644 (file)
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -45,14 +45,14 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 IMPLEMENT_CLASS(wxMediaCtrl, wxControl)
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_STATECHANGED)
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_PLAY)
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_PAUSE)
+wxDEFINE_EVENT( wxEVT_MEDIA_STATECHANGED, wxMediaEvent )
+wxDEFINE_EVENT( wxEVT_MEDIA_PLAY, wxMediaEvent )
+wxDEFINE_EVENT( wxEVT_MEDIA_PAUSE, wxMediaEvent )
 IMPLEMENT_CLASS(wxMediaBackend, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent)
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED)
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_LOADED)
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP)
+wxDEFINE_EVENT( wxEVT_MEDIA_FINISHED, wxMediaEvent )
+wxDEFINE_EVENT( wxEVT_MEDIA_LOADED, wxMediaEvent )
+wxDEFINE_EVENT( wxEVT_MEDIA_STOP, wxMediaEvent )
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
@@ -469,7 +469,7 @@ void wxMediaCtrl::DoMoveWindow(int x, int y, int w, int h)
 //---------------------------------------------------------------------------
 // wxMediaCtrl::MacVisibilityChanged
 //---------------------------------------------------------------------------
-#ifdef __WXMAC__
+#ifdef __WXOSX_CARBON__
 void wxMediaCtrl::MacVisibilityChanged()
 {
     wxControl::MacVisibilityChanged();
@@ -550,7 +550,7 @@ void wxMediaBackendCommonBase::QueueStopEvent()
 #ifdef __WXMSW__ // MSW has huge backends so we do it seperately
 FORCE_LINK(wxmediabackend_am)
 FORCE_LINK(wxmediabackend_wmp10)
-#else
+#elif !defined(__WXOSX_COCOA__)
 FORCE_LINK(basewxmediabackends)
 #endif