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

merged 2.4 branch into the trunk

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/execcmn.cpp
View File

@@ -81,7 +81,7 @@ inline void wxStreamTempInputBuffer::Init(wxPipeInputStream *stream)
void wxStreamTempInputBuffer::Update()
{
if ( m_stream && m_stream->IsAvailable() )
if ( m_stream && m_stream->CanRead() )
{
// realloc in blocks of 4Kb: this is the default (and minimal) buffer
// size of the Unix pipes so it should be the optimal step
@@ -111,24 +111,5 @@ wxStreamTempInputBuffer::~wxStreamTempInputBuffer()
}
}
// ----------------------------------------------------------------------------
// platform-dependent parts of wxProcess implementation included
// ----------------------------------------------------------------------------
bool wxProcess::IsInputOpened() const
{
return m_inputStream && ((wxPipeInputStream *)m_inputStream)->IsOpened();
}
bool wxProcess::IsInputAvailable() const
{
return m_inputStream && ((wxPipeInputStream *)m_inputStream)->IsAvailable();
}
bool wxProcess::IsErrorAvailable() const
{
return m_errorStream && ((wxPipeInputStream *)m_errorStream)->IsAvailable();
}
#endif // _WX_WXEXEC_CPP_