X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1a86313635020167c549ae0850728f09aba4704..0de6dfa701964fdabfd1f4027e68b4c7c5520107:/include/wx/mac/wave.h?ds=inline diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h index 0f30137a64..6fdbf6519b 100644 --- a/include/wx/mac/wave.h +++ b/include/wx/mac/wave.h @@ -13,10 +13,12 @@ #ifndef _WX_WAVE_H_ #define _WX_WAVE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "wave.h" #endif +#if wxUSE_WAVE + #include "wx/object.h" class WXDLLEXPORT wxWave : public wxObject @@ -33,16 +35,18 @@ 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: void* m_sndChan; - + wxString m_sndname; void* m_hSnd; int m_waveLength; bool m_isResource; }; +#endif #endif // _WX_WAVE_H_