make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook support to mediaplayer sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-04 07:49:40 +00:00
parent 4f9cd1cb7f
commit ecd20d4a91
4 changed files with 154 additions and 185 deletions

View File

@@ -191,7 +191,7 @@ protected:
wxSize DoGetBestSize() const;
#ifdef __WXMAC__
friend class wxMediaBackend;
friend class wxQTMediaBackend;
#endif
#ifdef __WXCOCOA__
friend class wxQTMediaBackend;
@@ -262,11 +262,6 @@ public:
virtual wxMediaState GetState()
{ return wxMEDIASTATE_STOPPED; }
#ifdef __WXMAC__
wxMacControl* GetControlPeer(wxControl* ctrl)
{ return ((wxMediaCtrl*)ctrl)->m_peer; }
#endif
DECLARE_CLASS(wxMediaBackend)
};