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

Change GetC to return an int so that it can return wxEOF on error.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2006-10-29 17:00:07 +00:00
parent 5c746f384e
commit 6ea48c514e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/stream.h
View File

@ -42,6 +42,8 @@ enum wxStreamError
wxSTREAM_READ_ERROR // generic read error
};
const int wxEOF = -1;
// ============================================================================
// base stream classes: wxInputStream and wxOutputStream
// ============================================================================
@ -106,11 +108,11 @@ public:
// undefined), otherwise 1
virtual char Peek();
// return one character from the stream, blocking until it appears if
// return one byte from the stream, blocking until it appears if
// necessary
//
// if EOF, return value is undefined and LastRead() will return 0 and not 1
char GetC();
// on success returns a value between 0 - 255, or wxEOF on EOF or error.
int GetC();
// read at most the given number of bytes from the stream
//

6
src/common/stream.cpp
View File

@ -809,11 +809,11 @@ bool wxInputStream::Ungetch(char c)
return Ungetch(&c, sizeof(c)) != 0;
}
char wxInputStream::GetC()
int wxInputStream::GetC()
{
char c;
unsigned char c;
Read(&c, sizeof(c));
return c;
return LastRead() ? c : wxEOF;
}
wxInputStream& wxInputStream::Read(void *buf, size_t size)