ensure that WIN32 is defined, winsock2.h relies on it being defined and fails in...

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

diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index ba9d1c0d9bcacef1be9259a1fb6e3392076c4acc..b95b00b9a48b13f005670dce7d6bfa79aa4ccf15 100644 (file)
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -12,11 +12,11 @@
 // TODO: Platform specific backend defaults?
 
 //===========================================================================
-// Definitions
+// Declarations
 //===========================================================================
 
 //---------------------------------------------------------------------------
-// Pre-compiled header stuff
+// Includes
 //---------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
@@ -29,11 +29,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
+    #include "wx/log.h"
 #endif
 
-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
 #include "wx/mediactrl.h"
 
 //===========================================================================
@@ -256,6 +254,7 @@ const wxClassInfo* wxMediaCtrl::NextBackend(wxClassInfo::const_iterator* it)
         if ( classInfo->IsKindOf(CLASSINFO(wxMediaBackend)) &&
              classInfo != CLASSINFO(wxMediaBackend) )
         {
+            ++(*it);
             return classInfo;
         }
     }
@@ -470,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();
@@ -551,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