X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/411165f3f40f411d6feba4d13d4934f7fff6cc4f..8482e4bdb9928fe9982ac214aee345b19894b39b:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index c8f7cae09a..4ef1fb157a 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 TRUE; + return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF; } bool wxProcess::IsInputAvailable() const { - return FALSE; + return m_inputStream && m_inputStream->CanRead(); } bool wxProcess::IsErrorAvailable() const { - return FALSE; + return m_errorStream && m_errorStream->CanRead(); } -#endif // !Win32 && !Unix - #endif // wxUSE_STREAMS // ---------------------------------------------------------------------------- @@ -164,7 +157,7 @@ bool wxProcess::Exists(int pid) { case wxKILL_OK: case wxKILL_ACCESS_DENIED: - return TRUE; + return true; default: case wxKILL_ERROR: @@ -173,7 +166,7 @@ bool wxProcess::Exists(int pid) // fall through case wxKILL_NO_PROCESS: - return FALSE; + return false; } }