X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..5fd588d2298a44428ac66bef1e4d9fc73e18d4fd:/include/wx/mac/wave.h diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h index e4934dedf8..c203db629f 100644 --- a/include/wx/mac/wave.h +++ b/include/wx/mac/wave.h @@ -13,17 +13,18 @@ #ifndef _WX_WAVE_H_ #define _WX_WAVE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "wave.h" #endif #include "wx/object.h" -class wxWave : public wxObject +class WXDLLEXPORT wxWave : public wxObject { public: wxWave(); wxWave(const wxString& fileName, bool isResource = FALSE); + wxWave(int size, const wxByte* data); ~wxWave(); public: @@ -32,13 +33,14 @@ public: bool Play(bool async = TRUE, bool looped = FALSE) const; protected: - bool Free(); + // prevent collision with some BSD definitions of macro Free() + bool FreeData(); private: - SndChannelPtr m_sndChan; + void* m_sndChan; wxString m_sndname; - SndListHandle m_hSnd; + void* m_hSnd; int m_waveLength; bool m_isResource; };