safer definitions for wx(U)Int32,16 (taken from intl.cpp)

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

diff --git a/include/wx/os2/wave.h b/include/wx/os2/wave.h
index e55bd5aa5f4a220c725c37df5ca76fd28a309e12..fdfce64dc743062b633d123d510d30c33f4e9064 100644 (file)
--- a/include/wx/os2/wave.h
+++ b/include/wx/os2/wave.h
@@ -2,21 +2,17 @@
 // Name:        wave.h
 // Purpose:     wxWave class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Name:        wave.h
 // Purpose:     wxWave class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/17/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 

-#ifdef __GNUG__
-#pragma interface "wave.h"
-#endif
-

 #include "wx/object.h"
 
 class wxWave : public wxObject
 #include "wx/object.h"
 
 class wxWave : public wxObject


@@ -24,10 +20,15 @@ class wxWave : public wxObject
 public:
   wxWave();
   wxWave(const wxString& fileName, bool isResource = FALSE);
 public:
   wxWave();
   wxWave(const wxString& fileName, bool isResource = FALSE);

+  wxWave(int size, const wxByte* data);

   ~wxWave();
 
 public:
   ~wxWave();
 
 public:

+  // Create from resource or file

   bool  Create(const wxString& fileName, bool isResource = FALSE);
   bool  Create(const wxString& fileName, bool isResource = FALSE);

+  // Create from data
+  bool Create(int size, const wxByte* data);
+

   bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
   bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 


@@ -35,7 +36,7 @@ protected:
   bool  Free();
 
 private:
   bool  Free();
 
 private:

-  char* m_waveData;
+  wxByte* m_waveData;

   int   m_waveLength;
   bool  m_isResource;
 };
   int   m_waveLength;
   bool  m_isResource;
 };