X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbb8c1d34c68feaeb5861aa91bdbf715b2d963b0..ec974d23005b5f225fe59e674d664b248619f3b2:/include/wx/gtk1/wave.h diff --git a/include/wx/gtk1/wave.h b/include/wx/gtk1/wave.h index 6b4095c243..c75f264084 100644 --- a/include/wx/gtk1/wave.h +++ b/include/wx/gtk1/wave.h @@ -12,14 +12,12 @@ #ifndef _WX_WAVE_H_ #define _WX_WAVE_H_ +#if wxUSE_WAVE + #ifdef __GNUG__ #pragma interface "wave.h" #endif -#ifndef byte -#define byte unsigned char -#endif - #include "wx/object.h" #ifndef AUDIODEV @@ -31,14 +29,14 @@ class wxWave : public wxObject public: wxWave(); wxWave(const wxString& fileName, bool isResource = FALSE); - wxWave(int size, const byte* data); + wxWave(int size, const wxByte* data); ~wxWave(); public: // Create from resource or file bool Create(const wxString& fileName, bool isResource = FALSE); // Create from data - bool Create(int size, const byte* data); + bool Create(int size, const wxByte* data); bool IsOk() const { return (m_waveData ? TRUE : FALSE); }; bool Play(bool async = TRUE, bool looped = FALSE); @@ -47,7 +45,7 @@ protected: bool Free(); private: - byte* m_waveData; + wxByte* m_waveData; int m_waveLength; bool m_isResource; @@ -61,3 +59,5 @@ private: #endif +#endif +