X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b767f7717866d5753a3b8d947534733083d9027f..c5fc899bf29ca7d9c4e2a070e28228b430a68dd3:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index 0e9769d95e..6e6a931c2f 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -6,7 +6,7 @@ // Created: 24/06/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "process.h" #endif @@ -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 // ----------------------------------------------------------------------------