don't break lines in the middle of word

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

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
index 4dee42630097771740c973cd2e38f6024f572837..9a9c17ca5f2030e2fd4d90345ad517d4a060c7eb 100644 (file)
--- a/include/wx/mac/wave.h
+++ b/include/wx/mac/wave.h
@@ -2,28 +2,31 @@
 // Name:        wave.h
 // Purpose:     wxWave class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Name:        wave.h
 // Purpose:     wxWave class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "wave.h"
 #endif
 
 #pragma interface "wave.h"
 #endif
 

+#if wxUSE_WAVE
+

 #include "wx/object.h"
 
 #include "wx/object.h"
 

-class wxWave : public wxObject
+class WXDLLEXPORT wxWave : public wxObject

 {
 public:
   wxWave();
   wxWave(const wxString& fileName, bool isResource = FALSE);
 {
 public:
   wxWave();
   wxWave(const wxString& fileName, bool isResource = FALSE);

+  wxWave(int size, const wxByte* data);

   ~wxWave();
 
 public:
   ~wxWave();
 
 public:


@@ -32,16 +35,18 @@ public:
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
 protected:
   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;
 
 private:
   void* m_sndChan;

-       
+

   wxString m_sndname;
   void* m_hSnd;
   int   m_waveLength;
   bool  m_isResource;
 };
 
   wxString m_sndname;
   void* m_hSnd;
   int   m_waveLength;
   bool  m_isResource;
 };
 

+#endif

 #endif
     // _WX_WAVE_H_
 #endif
     // _WX_WAVE_H_