X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79066131734040a7d01b87566fc1262e7fbe51ad..8a942c3dd3de286de6e9f374c05712d7e5c43f6d:/src/common/execcmn.cpp diff --git a/src/common/execcmn.cpp b/src/common/execcmn.cpp index f89e061b2c..a282842090 100644 --- a/src/common/execcmn.cpp +++ b/src/common/execcmn.cpp @@ -16,7 +16,7 @@ // this file should never be compiled directly, just included by other code #ifndef _WX_USED_BY_WXEXECUTE_ - #error "Please don't exclude this file from build!" + #error "You should never directly build this file!" #endif // ---------------------------------------------------------------------------- @@ -65,6 +65,8 @@ private: // the size of the buffer size_t m_size; + + DECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer) }; inline wxStreamTempInputBuffer::wxStreamTempInputBuffer() @@ -79,9 +81,10 @@ inline void wxStreamTempInputBuffer::Init(wxPipeInputStream *stream) m_stream = stream; } +inline 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 @@ -102,6 +105,7 @@ void wxStreamTempInputBuffer::Update() } } +inline wxStreamTempInputBuffer::~wxStreamTempInputBuffer() { if ( m_buffer ) @@ -111,24 +115,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_