Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug in Ungetch() which was preventing wxExecute() from working: this method must clear the EOF flag!

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-12 14:41:55 +00:00
parent 6faed57df6
commit 42a3aedbce
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/stream.cpp
View File

@@ -763,22 +763,27 @@ size_t wxInputStream::GetWBack(void *buf, size_t bsize)
size_t wxInputStream::Ungetch(const void *buf, size_t bufsize) size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
{ {
if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF )
{
// can't operate on this stream until the error is cleared
return 0;
}
char *ptrback = AllocSpaceWBack(bufsize); char *ptrback = AllocSpaceWBack(bufsize);
if (!ptrback) if (!ptrback)
return 0; return 0;
// Eof() shouldn't return TRUE any longer
if ( m_lasterror == wxSTREAM_EOF )
m_lasterror = wxSTREAM_NO_ERROR;
memcpy(ptrback, buf, bufsize); memcpy(ptrback, buf, bufsize);
return bufsize; return bufsize;
} }
bool wxInputStream::Ungetch(char c) bool wxInputStream::Ungetch(char c)
{ {
void *ptrback = AllocSpaceWBack(1); return Ungetch(&c, sizeof(char)) != 0;
if (!ptrback)
return FALSE;
*(char *)ptrback = c;
return TRUE;
} }
char wxInputStream::GetC() char wxInputStream::GetC()