merged both implementations of wxGenericDirCtrl

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

diff --git a/include/wx/msw/wave.h b/include/wx/msw/wave.h
index ce7e14fbe43137aed2ca6baa8478491481365d40..12807e7e20016bfda8eb30e69314dd4e918f0608 100644 (file)
--- a/include/wx/msw/wave.h
+++ b/include/wx/msw/wave.h
@@ -16,17 +16,24 @@
 #pragma interface "wave.h"
 #endif
 
+#if wxUSE_WAVE
+
 #include "wx/object.h"
 
-class wxWave : public wxObject
+class WXDLLEXPORT wxWave : public wxObject
 {
 public:
   wxWave();
   wxWave(const wxString& fileName, bool isResource = FALSE);
+  wxWave(int size, const wxByte* data);
   ~wxWave();
 
 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  IsOk() const { return (m_waveData ? TRUE : FALSE); };
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
@@ -34,10 +41,10 @@ protected:
   bool  Free();
 
 private:
-  byte* m_waveData;
+  wxByte* m_waveData;
   int   m_waveLength;
   bool  m_isResource;
 };
-
+#endif
 #endif