X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddc5c471d4d8d185e9f2bb9c91c92ddd3a2afff8..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/msw/sound.cpp?ds=sidebyside diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp index 2cf3619b60..334afd484d 100644 --- a/src/msw/sound.cpp +++ b/src/msw/sound.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sound.cpp +// Name: src/msw/sound.cpp // Purpose: wxSound // Author: Julian Smart // Modified by: 2005-07-29: Vadim Zeitlin: redesign @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "sound.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -74,7 +70,7 @@ private: GlobalPtr m_waveData; GlobalPtrLock m_waveDataPtr; - DECLARE_NO_COPY_CLASS(wxSoundDataMemory) + wxDECLARE_NO_COPY_CLASS(wxSoundDataMemory); }; // class for sound files and resources @@ -94,7 +90,7 @@ private: const wxString m_name; const bool m_isResource; - DECLARE_NO_COPY_CLASS(wxSoundDataFile) + wxDECLARE_NO_COPY_CLASS(wxSoundDataFile); }; // ============================================================================ @@ -148,11 +144,7 @@ wxSound::~wxSound() void wxSound::Free() { - if ( m_data ) - { - delete m_data; - m_data = NULL; - } + wxDELETE(m_data); } bool wxSound::CheckCreatedOk()