added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

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

diff --git a/include/wx/gtk/wave.h b/include/wx/gtk/wave.h
index 6b4095c2430f40671b83663724b242de39c5a5dd..92d678dab4b902397f3abeba807889e610288827 100644 (file)
--- a/include/wx/gtk/wave.h
+++ b/include/wx/gtk/wave.h
@@ -12,12 +12,12 @@
 #ifndef _WX_WAVE_H_
 #define _WX_WAVE_H_
 
-#ifdef __GNUG__
-#pragma interface "wave.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_WAVE
 
-#ifndef byte
-#define byte unsigned char
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "wave.h"
 #endif
 
 #include "wx/object.h"
@@ -31,14 +31,14 @@ class wxWave : public wxObject
 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
-  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);
@@ -47,7 +47,7 @@ protected:
   bool  Free();
 
 private:
-  byte* m_waveData;
+  wxByte* m_waveData;
   int   m_waveLength;
   bool  m_isResource;
 
@@ -61,3 +61,5 @@ private:
 
 #endif
 
+#endif
+