projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added defines to allow altered tab placement under gcc-2.95
[wxWidgets.git]
/
include
/
wx
/
gtk
/
wave.h
diff --git
a/include/wx/gtk/wave.h
b/include/wx/gtk/wave.h
index 6b4095c2430f40671b83663724b242de39c5a5dd..c75f2640840c2891b448209d9b7e3f317cb0f2d6 100644
(file)
--- a/
include/wx/gtk/wave.h
+++ b/
include/wx/gtk/wave.h
@@
-12,14
+12,12
@@
#ifndef _WX_WAVE_H_
#define _WX_WAVE_H_
#ifndef _WX_WAVE_H_
#define _WX_WAVE_H_
+#if wxUSE_WAVE
+
#ifdef __GNUG__
#pragma interface "wave.h"
#endif
#ifdef __GNUG__
#pragma interface "wave.h"
#endif
-#ifndef byte
-#define byte unsigned char
-#endif
-
#include "wx/object.h"
#ifndef AUDIODEV
#include "wx/object.h"
#ifndef AUDIODEV
@@
-31,14
+29,14
@@
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
b
yte* data);
+ wxWave(int size, const
wxB
yte* 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
b
yte* data);
+ bool Create(int size, const
wxB
yte* data);
bool IsOk() const { return (m_waveData ? TRUE : FALSE); };
bool Play(bool async = TRUE, bool looped = FALSE);
bool IsOk() const { return (m_waveData ? TRUE : FALSE); };
bool Play(bool async = TRUE, bool looped = FALSE);
@@
-47,7
+45,7
@@
protected:
bool Free();
private:
bool Free();
private:
-
b
yte* m_waveData;
+
wxB
yte* m_waveData;
int m_waveLength;
bool m_isResource;
int m_waveLength;
bool m_isResource;
@@
-61,3
+59,5
@@
private:
#endif
#endif
+#endif
+