Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / msw / sound.cpp

diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp
index 2cf3619b602ed42d3a167e1f3d7a4a59045aeb39..334afd484d091357355dd11a3039b61b99719d9e 100644 (file)
--- 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
 // Purpose:     wxSound
 // Author:      Julian Smart
 // Modified by: 2005-07-29: Vadim Zeitlin: redesign


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -74,7 +70,7 @@ private:
     GlobalPtr m_waveData;
     GlobalPtrLock m_waveDataPtr;
 
     GlobalPtr m_waveData;
     GlobalPtrLock m_waveDataPtr;
 

-    DECLARE_NO_COPY_CLASS(wxSoundDataMemory)
+    wxDECLARE_NO_COPY_CLASS(wxSoundDataMemory);

 };
 
 // class for sound files and resources
 };
 
 // class for sound files and resources


@@ -94,7 +90,7 @@ private:
     const wxString m_name;
     const bool m_isResource;
 
     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()
 {
 
 void wxSound::Free()
 {

-    if ( m_data )
-    {
-        delete m_data;
-        m_data = NULL;
-    }
+    wxDELETE(m_data);

 }
 
 bool wxSound::CheckCreatedOk()
 }
 
 bool wxSound::CheckCreatedOk()