A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/msw/wave.h b/include/wx/msw/wave.h
index 4fc3dc71e946b9e7eab68c1ec312225634771a75..12807e7e20016bfda8eb30e69314dd4e918f0608 100644 (file)
--- a/include/wx/msw/wave.h
+++ b/include/wx/msw/wave.h
@@ -16,21 +16,23 @@
 #pragma interface "wave.h"
 #endif
 
 #pragma interface "wave.h"
 #endif
 

+#if wxUSE_WAVE
+

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

-class DLLEXPORT 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 byte* data);
+  wxWave(int size, const wxByte* data);

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

-  bool Create(int size, const byte* 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;


@@ -39,10 +41,10 @@ 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;
 };

-
+#endif

 #endif
 
 #endif