AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

can't support enums that have comma after last element

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 1999-12-21 17:48:24 +00:00
parent 28c9c76e7f
commit 657d209757
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/wx/stream.h
View File

@ -42,23 +42,23 @@ WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
#define wxStream_EOF wxSTREAM_EOF #define wxStream_EOF wxSTREAM_EOF
#define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR #define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR
#define wxStream_READ_ERR wxSTREAM_READ_ERROR #define wxStream_READ_ERR wxSTREAM_READ_ERROR
typedef enum { typedef enum {
wxSTREAM_NO_ERROR = 0, wxSTREAM_NO_ERROR = 0,
wxSTREAM_NO_ERR = wxSTREAM_NO_ERROR, wxSTREAM_NO_ERR = wxSTREAM_NO_ERROR,
wxSTREAM_NOERROR = wxSTREAM_NO_ERROR, wxSTREAM_NOERROR = wxSTREAM_NO_ERROR,
wxSTREAM_EOF, wxSTREAM_EOF,
wxSTREAM_WRITE_ERROR, wxSTREAM_WRITE_ERROR,
wxSTREAM_WRITE_ERR = wxSTREAM_WRITE_ERROR, wxSTREAM_WRITE_ERR = wxSTREAM_WRITE_ERROR,
wxSTREAM_READ_ERROR, wxSTREAM_READ_ERROR,
wxSTREAM_READ_ERR = wxSTREAM_READ_ERROR, wxSTREAM_READ_ERR = wxSTREAM_READ_ERROR
} wxStreamError; } wxStreamError;
class WXDLLEXPORT wxStreamBase class WXDLLEXPORT wxStreamBase
{ {
public: public:
wxStreamBase(); wxStreamBase();
@ -81,7 +81,7 @@ protected:
wxStreamError m_lasterror; wxStreamError m_lasterror;
}; };
class WXDLLEXPORT wxInputStream: public wxStreamBase class WXDLLEXPORT wxInputStream: public wxStreamBase
{ {
public: public:
wxInputStream(); wxInputStream();
@ -121,7 +121,7 @@ protected:
size_t GetWBack(char *buf, size_t bsize); size_t GetWBack(char *buf, size_t bsize);
}; };
class WXDLLEXPORT wxOutputStream: public wxStreamBase class WXDLLEXPORT wxOutputStream: public wxStreamBase
{ {
public: public:
wxOutputStream(); wxOutputStream();
@ -149,7 +149,7 @@ public:
// A stream for measuring streamed output // A stream for measuring streamed output
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class wxCountingOutputStream: public wxOutputStream class wxCountingOutputStream: public wxOutputStream
{ {
public: public:
wxCountingOutputStream(); wxCountingOutputStream();
@ -170,7 +170,7 @@ protected:
// "Filter" streams // "Filter" streams
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class WXDLLEXPORT wxFilterInputStream: public wxInputStream class WXDLLEXPORT wxFilterInputStream: public wxInputStream
{ {
public: public:
wxFilterInputStream(); wxFilterInputStream();
@ -185,7 +185,7 @@ protected:
wxInputStream *m_parent_i_stream; wxInputStream *m_parent_i_stream;
}; };
class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream
{ {
public: public:
wxFilterOutputStream(); wxFilterOutputStream();
@ -202,7 +202,7 @@ protected:
// Stream buffer // Stream buffer
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class WXDLLEXPORT wxStreamBuffer class WXDLLEXPORT wxStreamBuffer
{ {
public: public:
typedef enum { typedef enum {
@ -265,7 +265,7 @@ protected:
// wxBufferedStreams // wxBufferedStreams
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class wxBufferedInputStream: public wxFilterInputStream class wxBufferedInputStream: public wxFilterInputStream
{ {
public: public:
wxBufferedInputStream(wxInputStream& stream); wxBufferedInputStream(wxInputStream& stream);
@ -273,7 +273,7 @@ public:
char Peek(); char Peek();
wxInputStream& Read(void *buffer, size_t size); wxInputStream& Read(void *buffer, size_t size);
// Position functions // Position functions
off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart); off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellI() const; off_t TellI() const;
@ -283,19 +283,19 @@ public:
protected: protected:
size_t OnSysRead(void *buffer, size_t bufsize); size_t OnSysRead(void *buffer, size_t bufsize);
off_t OnSysSeek(off_t seek, wxSeekMode mode); off_t OnSysSeek(off_t seek, wxSeekMode mode);
off_t OnSysTell() const; off_t OnSysTell() const;
wxStreamBuffer *m_i_streambuf; wxStreamBuffer *m_i_streambuf;
}; };
class wxBufferedOutputStream: public wxFilterOutputStream class wxBufferedOutputStream: public wxFilterOutputStream
{ {
public: public:
wxBufferedOutputStream(wxOutputStream& stream); wxBufferedOutputStream(wxOutputStream& stream);
~wxBufferedOutputStream(); ~wxBufferedOutputStream();
wxOutputStream& Write(const void *buffer, size_t size); wxOutputStream& Write(const void *buffer, size_t size);
// Position functions // Position functions
off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart); off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
off_t TellO() const; off_t TellO() const;
@ -303,13 +303,13 @@ public:
void Sync(); void Sync();
size_t GetSize() const; size_t GetSize() const;
wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; } wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
protected: protected:
size_t OnSysWrite(const void *buffer, size_t bufsize); size_t OnSysWrite(const void *buffer, size_t bufsize);
off_t OnSysSeek(off_t seek, wxSeekMode mode); off_t OnSysSeek(off_t seek, wxSeekMode mode);
off_t OnSysTell() const; off_t OnSysTell() const;
wxStreamBuffer *m_o_streambuf; wxStreamBuffer *m_o_streambuf;
}; };