Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/msw/wave.h b/include/wx/msw/wave.h
index 344fc7ced52019217fd29b97420fd08c88d2fd60..cd025e863a6480e38f955cf2d7f93e6798adce95 100644 (file)
--- a/include/wx/msw/wave.h
+++ b/include/wx/msw/wave.h
@@ -5,28 +5,35 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WAVEH__
-#define __WAVEH__
+#ifndef _WX_WAVE_H_
+#define _WX_WAVE_H_

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

+#if wxUSE_WAVE
+

 #include "wx/object.h"
 
 #include "wx/object.h"
 

-class wxWave : public wxObject
+class WXDLLEXPORT 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;
 


@@ -34,10 +41,12 @@ protected:
   bool  Free();
 
 private:
   bool  Free();
 
 private:

-  byte* m_waveData;
+  wxByte* m_waveData;

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

-};

 
 

+    DECLARE_NO_COPY_CLASS(wxWave)
+};
+#endif

 #endif
 
 #endif