fix typo in drawing slider ticks; added assert to check for it (slightly modified...

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

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
index 4dee42630097771740c973cd2e38f6024f572837..c203db629f69dcd7b9df10b07b3ac3debda64237 100644 (file)
--- 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,7 +33,8 @@ 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;