Correctly restore the originally used C locale in wxLocale dtor.

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

diff --git a/src/os2/sound.cpp b/src/os2/sound.cpp
index 5bde6ee19fb095a3c428f7196c9bc828040bb3f9..a901a8dc338b7f9ed1e439ae698b5db42c991f0c 100644 (file)
--- a/src/os2/sound.cpp
+++ b/src/os2/sound.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxSound class implementation: optional
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -42,7 +42,7 @@ wxSound::wxSound(const wxString& sFileName, bool isResource)
   Create(sFileName, 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);
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
 {
   Create(size, data);


@@ -108,7 +108,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;
 {
   Free();
   m_isResource = FALSE;


@@ -117,26 +117,27 @@ bool wxSound::Create(int size, const wxByte* data)
   if (!m_waveData)
      return FALSE;
 
   if (!m_waveData)
      return FALSE;
 

-  for (int i=0; i<size; i++) m_waveData[i] = data[i];
+  memcpy(m_waveData, data, size);

   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxSound::DoPlay(unsigned flags) const
+bool wxSound::DoPlay(unsigned WXUNUSED(flags)) const

 {
 {

-  if (!IsOk())
-    return FALSE;
+    if (!IsOk())
+        return false;
+

 // TODO:
 /*
 // TODO:
 /*

-  return ( ::PlaySound((LPCTSTR)m_waveData, NULL, SND_MEMORY |
-    SND_NODEFAULT | (async ? SND_ASYNC : SND_SYNC) | (looped ? (SND_LOOP | SND_ASYNC) : 0)) != 0 );
+    return ( ::PlaySound((LPCTSTR)m_waveData, NULL, SND_MEMORY |
+             SND_NODEFAULT | (async ? SND_ASYNC : SND_SYNC) | (looped ? (SND_LOOP | SND_ASYNC) : 0)) != 0 );

 */
 */

-    return FALSE;
+    return false;

 }
 
 bool wxSound::Free()
 {
 }
 
 bool wxSound::Free()
 {

-  if (m_waveData)
-  {
+    if (m_waveData)
+    {

 //  HGLOBAL waveData = ::GlobalHandle(m_waveData);
 
 // TODO:
 //  HGLOBAL waveData = ::GlobalHandle(m_waveData);
 
 // TODO:


@@ -156,7 +157,6 @@ bool wxSound::Free()
       return TRUE;
     }
 */
       return TRUE;
     }
 */

-  }
-  return FALSE;
+    }
+    return false;

 }
 }

-