1. wxProcess changes to make capturing subprocess output easier (and more
reliable), now works in both sync and async modes 2. wxSafeYieldBug() corrected, wxWindowDisabler which is now used in it added and documented 3. exec sample updated to illustrate capturing the subprocess output 4. wxStreamBase::IsOk() added 5. wxInputStream::Eof() added and non-blocking Eof() implementation in wxPipeInputStream used by wxExecute git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,30 +52,42 @@ class WXDLLEXPORT wxProcess : public wxEvtHandler
|
||||
DECLARE_DYNAMIC_CLASS(wxProcess)
|
||||
|
||||
public:
|
||||
wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, bool needPipe = FALSE, int id = -1);
|
||||
~wxProcess();
|
||||
wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1)
|
||||
{ Init(parent, id, FALSE); }
|
||||
wxProcess(wxEvtHandler *parent, bool redirect)
|
||||
{ Init(parent, -1, redirect); }
|
||||
|
||||
virtual ~wxProcess();
|
||||
|
||||
// may be overridden to be notified about process termination
|
||||
virtual void OnTerminate(int pid, int status);
|
||||
|
||||
// call this before passing the object to wxExecute() to redirect the
|
||||
// launched process stdin/stdout, then use GetInputStream() and
|
||||
// GetOutputStream() to get access to them
|
||||
void Redirect() { m_redirect = TRUE; }
|
||||
bool IsRedirected() const { return m_redirect; }
|
||||
|
||||
// detach from the parent - should be called by the parent if it's deleted
|
||||
// before the process it started terminates
|
||||
void Detach();
|
||||
|
||||
// Pipe handling
|
||||
wxInputStream *GetInputStream() const;
|
||||
wxOutputStream *GetOutputStream() const;
|
||||
wxInputStream *GetInputStream() const { return m_inputStream; }
|
||||
wxOutputStream *GetOutputStream() const { return m_outputStream; }
|
||||
|
||||
// These functions should not be called by the usual user. They are only
|
||||
// intended to be used by wxExecute.
|
||||
// Install pipes
|
||||
void SetPipeStreams(wxInputStream *in_stream, wxOutputStream *out_stream);
|
||||
bool NeedPipe() const;
|
||||
// implementation only (for wxExecute)
|
||||
void SetPipeStreams(wxInputStream *inStream, wxOutputStream *outStream);
|
||||
|
||||
protected:
|
||||
void Init(wxEvtHandler *parent, int id, bool redirect);
|
||||
|
||||
int m_id;
|
||||
bool m_needPipe;
|
||||
wxInputStream *m_in_stream;
|
||||
wxOutputStream *m_out_stream;
|
||||
|
||||
wxInputStream *m_inputStream;
|
||||
wxOutputStream *m_outputStream;
|
||||
|
||||
bool m_redirect;
|
||||
};
|
||||
|
||||
typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
|
||||
|
Reference in New Issue
Block a user