TWIN32 compatibility added; wxMotif uses wxGTK's wxPostScriptDC;
wxByte replaces byte (can conflict with windows.h) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,10 +16,6 @@
|
||||
#pragma interface "wave.h"
|
||||
#endif
|
||||
|
||||
#ifndef byte
|
||||
#define byte unsigned char
|
||||
#endif
|
||||
|
||||
#include "wx/object.h"
|
||||
|
||||
#ifndef AUDIODEV
|
||||
@@ -31,14 +27,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 +43,7 @@ protected:
|
||||
bool Free();
|
||||
|
||||
private:
|
||||
byte* m_waveData;
|
||||
wxByte* m_waveData;
|
||||
int m_waveLength;
|
||||
bool m_isResource;
|
||||
|
||||
|
Reference in New Issue
Block a user