Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
index 22530b7d4a824174c15c93e5171dd1550e6f8a04..e8fdad542840217ee8f910955fe0e9a312f89118 100644 (file)
--- a/include/wx/os2/sound.h
+++ b/include/wx/os2/sound.h
@@ -1,13 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sound.h
+// Name:        wx/os2/sound.h

 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Copyright:   (c) David Webster

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_


@@ -20,20 +19,20 @@ class wxSound : public wxSoundBase
 public:
   wxSound();
   wxSound(const wxString& fileName, bool isResource = FALSE);
 public:
   wxSound();
   wxSound(const wxString& fileName, bool isResource = FALSE);

-  wxSound(int size, const wxByte* data);
-  ~wxSound();
+  wxSound(size_t size, const void* data);
+  virtual ~wxSound();

 
 public:
   // Create from resource or file
   bool  Create(const wxString& fileName, bool isResource = FALSE);
   // Create from data
 
 public:
   // Create from resource or file
   bool  Create(const wxString& fileName, bool isResource = FALSE);
   // Create from data

-  bool Create(int size, const wxByte* data);
+  bool Create(size_t size, const void* data);

 
 

-  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
+  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); }

 
 protected:
   bool  Free();
 
 protected:
   bool  Free();

-  
+

   bool  DoPlay(unsigned flags) const;
 
 private:
   bool  DoPlay(unsigned flags) const;
 
 private: