// Created: 24/06/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "process.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// event tables and such
// ----------------------------------------------------------------------------
-DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
+wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent );
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
SetNextHandler(parent);
m_id = id;
+ m_pid = 0;
m_redirect = (flags & wxPROCESS_REDIRECT) != 0;
#if wxUSE_STREAMS
/* static */
wxProcess *wxProcess::Open(const wxString& cmd, int flags)
{
+ wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." ));
wxProcess *process = new wxProcess(wxPROCESS_REDIRECT);
- if ( !wxExecute(cmd, flags, process) )
+ long pid = wxExecute(cmd, flags, process);
+ if( !pid )
{
// couldn't launch the process
delete process;
return NULL;
}
+ process->SetPid(pid);
+
return process;
}
void wxProcess::Detach()
{
- SetNextHandler(NULL);
+ // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor)
+ // not also from the previous handler like wxEvtHandler::Unlink() would do:
+
+ if (m_nextHandler)
+ m_nextHandler->SetPreviousHandler(m_previousHandler);
+
+ m_nextHandler = NULL;
}
// ----------------------------------------------------------------------------
m_outputStream = outputStream;
}
+bool wxProcess::IsInputOpened() const
+{
+ return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF;
+}
+
+bool wxProcess::IsInputAvailable() const
+{
+ return m_inputStream && m_inputStream->CanRead();
+}
+
+bool wxProcess::IsErrorAvailable() const
+{
+ return m_errorStream && m_errorStream->CanRead();
+}
+
#endif // wxUSE_STREAMS
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
/* static */
-wxKillError wxProcess::Kill(int pid, wxSignal sig)
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)
{
wxKillError rc;
- (void)wxKill(pid, sig, &rc);
+ (void)wxKill(pid, sig, &rc, flags);
return rc;
}
{
case wxKILL_OK:
case wxKILL_ACCESS_DENIED:
- return TRUE;
+ return true;
default:
case wxKILL_ERROR:
case wxKILL_BAD_SIGNAL:
- wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") );
+ wxFAIL_MSG( wxT("unexpected wxProcess::Kill() return code") );
// fall through
case wxKILL_NO_PROCESS:
- return FALSE;
+ return false;
}
}