From: Kevin Ollivier <kevino@theolliviers.com>
Date: Thu, 25 Sep 2008 00:02:52 +0000 (+0000)
Subject: Get wxMediaCtrl stub impl. going for OS X Cocoa.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4954ee50328dc010ec3c934fd6deeab08c4447d6?ds=inline

Get wxMediaCtrl stub impl. going for OS X Cocoa.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 7bf5b913fc..984a260879 100644
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -221,10 +221,10 @@ protected:
 
     //FIXME:  This is nasty... find a better way to work around
     //inheritance issues
-#if defined(__WXMAC__)
+#if defined(__WXOSX_CARBON__)
     virtual void MacVisibilityChanged();
 #endif
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if defined(__WXOSX_CARBON__) || defined(__WXCOCOA__)
     friend class wxQTMediaBackend;
 #endif
     class wxMediaBackend* m_imp;
diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 6120cada49..b95b00b9a4 100644
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -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