fixes to menu stock items support (patch 1547639)

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

diff --git a/include/wx/mac/sound.h b/include/wx/mac/sound.h
index 18a84d101b0077e0bd78bcd4b5a19795e2ac00a3..b282748a9a208961c4b1341bff4b2ec03dc097cf 100644 (file)
--- a/include/wx/mac/sound.h
+++ b/include/wx/mac/sound.h
@@ -1,53 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        sound.h
-// Purpose:     wxSound class (loads and plays short Windows .wav files).
-//              Optional on non-Windows platforms.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SOUND_H_
-#define _WX_SOUND_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sound.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/sound.h"
+#else
+#include "wx/mac/carbon/sound.h"
 #endif
-
-#if wxUSE_SOUND
-
-#include "wx/object.h"
-
-class WXDLLEXPORT wxSound : public wxSoundBase
-{
-public:
-  wxSound();
-  wxSound(const wxString& fileName, bool isResource = FALSE);
-  wxSound(int size, const wxByte* data);
-  ~wxSound();
-
-public:
-  bool  Create(const wxString& fileName, bool isResource = FALSE);
-  bool  IsOk() const { return !m_sndname.IsEmpty(); }
-
-protected:
-  // prevent collision with some BSD definitions of macro Free()
-  bool  FreeData();
-  
-  bool  DoPlay(unsigned flags) const;
-
-private:
-  void* m_sndChan;
-
-  wxString m_sndname;
-  void* m_hSnd;
-  int   m_waveLength;
-  bool  m_isResource;
-};
-
-#endif
-#endif
-    // _WX_SOUND_H_