projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix crash when using wxDataViewListStore::DeleteAllItems
[wxWidgets.git]
/
include
/
wx
/
process.h
diff --git
a/include/wx/process.h
b/include/wx/process.h
index 67ac9c258fbb889f3c4a2cabbca04e3a24f411d0..814f3e06a51302631cbbd7179c1ba0ac0cfc4336 100644
(file)
--- a/
include/wx/process.h
+++ b/
include/wx/process.h
@@
-1,21
+1,17
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: process.h
+// Name:
wx/
process.h
// Purpose: wxProcess class
// Author: Guilhem Lavaux
// Modified by: Vadim Zeitlin to check error codes, added Detach() method
// Created: 24/06/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Guilhem Lavaux
// Purpose: wxProcess class
// Author: Guilhem Lavaux
// Modified by: Vadim Zeitlin to check error codes, added Detach() method
// Created: 24/06/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Guilhem Lavaux
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PROCESSH__
#define _WX_PROCESSH__
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PROCESSH__
#define _WX_PROCESSH__
-#ifdef __GNUG__
- #pragma interface "process.h"
-#endif
-
#include "wx/event.h"
#if wxUSE_STREAMS
#include "wx/event.h"
#if wxUSE_STREAMS
@@
-39,11
+35,11
@@
enum
// function will be called when the process terminates.
// ----------------------------------------------------------------------------
// function will be called when the process terminates.
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxProcess : public wxEvtHandler
+class WXDLL
IMPEXP_BASE
wxProcess : public wxEvtHandler
{
public:
// kill the process with the given PID
{
public:
// kill the process with the given PID
- static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM);
+ static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM
, int flags = wxKILL_NOCHILDREN
);
// test if the given process exists
static bool Exists(int pid);
// test if the given process exists
static bool Exists(int pid);
@@
-55,24
+51,27
@@
public:
// on error NULL is returned, in any case the process object will be
// deleted automatically when the process terminates and should *not* be
// deleted by the caller
// on error NULL is returned, in any case the process object will be
// deleted automatically when the process terminates and should *not* be
// deleted by the caller
- static wxProcess *Open(const wxString& cmd);
+ static wxProcess *Open(const wxString& cmd
, int flags = wxEXEC_ASYNC
);
// ctors
// ctors
- wxProcess(wxEvtHandler *parent =
(wxEvtHandler *) NULL, int id = -1
)
- { Init(parent,
i
d, wxPROCESS_DEFAULT); }
+ wxProcess(wxEvtHandler *parent =
NULL, int nId = wxID_ANY
)
+ { Init(parent,
nI
d, wxPROCESS_DEFAULT); }
- wxProcess(int flags) { Init(NULL,
-1
, flags); }
+ wxProcess(int flags) { Init(NULL,
wxID_ANY
, flags); }
virtual ~wxProcess();
virtual ~wxProcess();
+ // get the process ID of the process executed by Open()
+ long GetPid() const { return m_pid; }
+
// 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
// 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
; }
+ 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
bool IsRedirected() const { return m_redirect; }
// detach from the parent - should be called by the parent if it's deleted
@@
-88,6
+87,13
@@
public:
// close the output stream indicating that nothing more will be written
void CloseOutput() { delete m_outputStream; m_outputStream = NULL; }
// close the output stream indicating that nothing more will be written
void CloseOutput() { delete m_outputStream; m_outputStream = NULL; }
+ // return true if the child process stdout is not closed
+ bool IsInputOpened() const;
+
+ // return true if any input is available on the child process stdout/err
+ bool IsInputAvailable() const;
+ bool IsErrorAvailable() const;
+
// implementation only (for wxExecute)
//
// NB: the streams passed here should correspond to the child process
// implementation only (for wxExecute)
//
// NB: the streams passed here should correspond to the child process
@@
-98,16
+104,12
@@
public:
wxInputStream *errStream);
#endif // wxUSE_STREAMS
wxInputStream *errStream);
#endif // wxUSE_STREAMS
- // for backwards compatibility only, don't use
-#if WXWIN_COMPATIBILITY_2_2
- wxProcess(wxEvtHandler *parent, bool redirect)
- { Init(parent, -1, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); }
-#endif // WXWIN_COMPATIBILITY_2_2
-
protected:
void Init(wxEvtHandler *parent, int id, int flags);
protected:
void Init(wxEvtHandler *parent, int id, int flags);
+ void SetPid(long pid) { m_pid = pid; }
int m_id;
int m_id;
+ long m_pid;
#if wxUSE_STREAMS
// these streams are connected to stdout, stderr and stdin of the child
#if wxUSE_STREAMS
// these streams are connected to stdout, stderr and stdin of the child
@@
-121,20
+123,21
@@
protected:
bool m_redirect;
DECLARE_DYNAMIC_CLASS(wxProcess)
bool m_redirect;
DECLARE_DYNAMIC_CLASS(wxProcess)
+ wxDECLARE_NO_COPY_CLASS(wxProcess);
};
// ----------------------------------------------------------------------------
// wxProcess events
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
// wxProcess events
// ----------------------------------------------------------------------------
-BEGIN_DECLARE_EVENT_TYPES()
- DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440)
-END_DECLARE_EVENT_TYPES()
+class WXDLLIMPEXP_FWD_BASE wxProcessEvent;
+
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent );
-class WXDLL
EXPORT
wxProcessEvent : public wxEvent
+class WXDLL
IMPEXP_BASE
wxProcessEvent : public wxEvent
{
public:
{
public:
- wxProcessEvent(int
id = 0, int pid = 0, int exitcode = 0) : wxEvent(i
d)
+ wxProcessEvent(int
nId = 0, int pid = 0, int exitcode = 0) : wxEvent(nI
d)
{
m_eventType = wxEVT_END_PROCESS;
m_pid = pid;
{
m_eventType = wxEVT_END_PROCESS;
m_pid = pid;
@@
-155,17
+158,15
@@
public:
int m_pid,
m_exitcode;
int m_pid,
m_exitcode;
- DECLARE_DYNAMIC_CLASS(wxProcessEvent)
+ DECLARE_DYNAMIC_CLASS
_NO_ASSIGN
(wxProcessEvent)
};
typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
};
typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
+#define wxProcessEventHandler(func) \
+ wxEVENT_HANDLER_CAST(wxProcessEventFunction, func)
+
#define EVT_END_PROCESS(id, func) \
#define EVT_END_PROCESS(id, func) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_END_PROCESS, id, -1, \
- (wxObjectEventFunction) \
- (wxEventFunction) \
- (wxProcessEventFunction) & func, NULL),
+ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
-#endif
- // _WX_PROCESSH__
+#endif // _WX_PROCESSH__