merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -120,28 +120,21 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
m_outputStream = outputStream;
}
// these are implemented in platform-dependent (and correct!) way under MSW and
// Unix but we still have to provide these dummy versions for the other
// platforms here
#if !defined(__WIN32__) && !defined(__UNIX_LIKE__)
bool wxProcess::IsInputOpened() const
{
return m_inputStream != NULL;
return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF;
}
bool wxProcess::IsInputAvailable() const
{
return m_inputStream && !m_inputStream->Eof();
return m_inputStream && m_inputStream->CanRead();
}
bool wxProcess::IsErrorAvailable() const
{
return m_errorStream && !m_errorStream->Eof();
return m_errorStream && m_errorStream->CanRead();
}
#endif // !Win32 && !Unix
#endif // wxUSE_STREAMS
// ----------------------------------------------------------------------------