Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
index 2b6c07a54c7541939e5f6105988483a3dd852d60..b409029e8be8ade4d43e18f09d8d3cf5d3820ab7 100644 (file)
--- a/include/wx/os2/sound.h
+++ b/include/wx/os2/sound.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Author:      David Webster


@@ -20,20 +20,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(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
   virtual ~wxSound();
 
 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: