Deallocate wxThreadSpecificInfo when wxThread ends.

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

diff --git a/src/os2/sound.cpp b/src/os2/sound.cpp
index 91d6c1206fd37d98357731a57e54a049d9d56483..48fa95740d8a2eed060b17f0b9db6b27de6fccfa 100644 (file)
--- a/src/os2/sound.cpp
+++ b/src/os2/sound.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sound.cpp
+// Name:        src/os2/sound.cpp
 // Purpose:     wxSound class implementation: optional
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,7 +41,7 @@ wxSound::wxSound(const wxString& sFileName, bool isResource)
   Create(sFileName, isResource);
 }
 
-wxSound::wxSound(int size, const wxByte* data)
+wxSound::wxSound(size_t size, const void* data)
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
 {
   Create(size, data);
@@ -108,7 +107,7 @@ bool wxSound::Create(const wxString& fileName, bool isResource)
   }
 }
 
-bool wxSound::Create(int size, const wxByte* data)
+bool wxSound::Create(size_t size, const void* data)
 {
   Free();
   m_isResource = FALSE;
@@ -117,7 +116,7 @@ bool wxSound::Create(int size, const wxByte* data)
   if (!m_waveData)
      return FALSE;
 
-  for (int i=0; i<size; i++) m_waveData[i] = data[i];
+  memcpy(m_waveData, data, size);
   return TRUE;
 }