added definition of TARGET_CARBON when compiling with non generated setup.h

[wxWidgets.git] / include / wx / mac / wave.h

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
index e4934dedf802d0b4a91d755de568ce947f20a926..6fdbf6519bf581c63b5b4723f4d3f38c6b64999b 100644 (file)
--- a/include/wx/mac/wave.h
+++ b/include/wx/mac/wave.h
@@ -13,17 +13,20 @@
 #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 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,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:
-  SndChannelPtr m_sndChan;
-       
+  void* m_sndChan;
+
   wxString m_sndname;
-  SndListHandle m_hSnd;
+  void* m_hSnd;
   int   m_waveLength;
   bool  m_isResource;
 };
 
+#endif
 #endif
     // _WX_WAVE_H_