X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/625d14abfaf803bec9e8c1c42ed2b4bc94afd75e..872051d89bd098d1e6052fabc07174e67296a35f:/include/wx/mac/carbon/sound.h

diff --git a/include/wx/mac/carbon/sound.h b/include/wx/mac/carbon/sound.h
index ee2743b631..670b170b9e 100644
--- a/include/wx/mac/carbon/sound.h
+++ b/include/wx/mac/carbon/sound.h
@@ -2,42 +2,37 @@
 // Name:        sound.h
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
-// Author:      Stefan Csomor
+// Author:      Ryan Norton, Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
+// Copyright:   (c) Ryan Norton, Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
 #define _WX_SOUND_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sound.h"
-#endif
-
 #if wxUSE_SOUND
 
 #include "wx/object.h"
 
-class WXDLLEXPORT wxSound : public wxSoundBase
+class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
 {
 public:
   wxSound();
   wxSound(const wxString& fileName, bool isResource = FALSE);
   wxSound(int size, const wxByte* data);
-  ~wxSound();
+  virtual ~wxSound();
 
 public:
   bool  Create(const wxString& fileName, bool isResource = FALSE);
   bool  IsOk() const { return !m_sndname.IsEmpty(); }
+  static void  Stop();
+  static bool IsPlaying();
 
   void* GetHandle();
-protected:
-  // prevent collision with some BSD definitions of macro Free()
-  bool  FreeData();
-  
+protected:  
   bool  DoPlay(unsigned flags) const;
 
 private: