Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get wxMediaCtrl stub impl. going for OS X Cocoa.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2008-09-25 00:02:52 +00:00
parent f53c4d3b88
commit 4954ee5032
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mediactrl.h
View File

@@ -221,10 +221,10 @@ protected:
//FIXME: This is nasty... find a better way to work around //FIXME: This is nasty... find a better way to work around
//inheritance issues //inheritance issues
#if defined(__WXMAC__) #if defined(__WXOSX_CARBON__)
virtual void MacVisibilityChanged(); virtual void MacVisibilityChanged();
#endif #endif
#if defined(__WXMAC__) || defined(__WXCOCOA__) #if defined(__WXOSX_CARBON__) || defined(__WXCOCOA__)
friend class wxQTMediaBackend; friend class wxQTMediaBackend;
#endif #endif
class wxMediaBackend* m_imp; class wxMediaBackend* m_imp;

4
src/common/mediactrlcmn.cpp
View File

@@ -469,7 +469,7 @@ void wxMediaCtrl::DoMoveWindow(int x, int y, int w, int h)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxMediaCtrl::MacVisibilityChanged // wxMediaCtrl::MacVisibilityChanged
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#ifdef __WXMAC__ #ifdef __WXOSX_CARBON__
void wxMediaCtrl::MacVisibilityChanged() void wxMediaCtrl::MacVisibilityChanged()
{ {
wxControl::MacVisibilityChanged(); wxControl::MacVisibilityChanged();
@@ -550,7 +550,7 @@ void wxMediaBackendCommonBase::QueueStopEvent()
#ifdef __WXMSW__ // MSW has huge backends so we do it seperately #ifdef __WXMSW__ // MSW has huge backends so we do it seperately
FORCE_LINK(wxmediabackend_am) FORCE_LINK(wxmediabackend_am)
FORCE_LINK(wxmediabackend_wmp10) FORCE_LINK(wxmediabackend_wmp10)
#else #elif !defined(__WXOSX_COCOA__)
FORCE_LINK(basewxmediabackends) FORCE_LINK(basewxmediabackends)
#endif #endif