projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add IsShown() accessor which is sometimes more convenient than IsHidden()
[wxWidgets.git]
/
include
/
wx
/
process.h
diff --git
a/include/wx/process.h
b/include/wx/process.h
index 53dae01c245bbf7f10f2543fda5698e7cb688329..d49f9f9242743e095aeda3436ec21912d71ea3bc 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: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PROCESSH__
#define _WX_PROCESSH__
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PROCESSH__
#define _WX_PROCESSH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "process.h"
-#endif
-
#include "wx/event.h"
#if wxUSE_STREAMS
#include "wx/event.h"
#if wxUSE_STREAMS
@@
-43,7
+39,7
@@
class WXDLLIMPEXP_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);
@@
-59,20
+55,23
@@
public:
// ctors
// ctors
- wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int
id = -1
)
- { Init(parent,
i
d, wxPROCESS_DEFAULT); }
+ wxProcess(wxEvtHandler *parent = (wxEvtHandler *) 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,10
+87,10
@@
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
+ // return
true
if the child process stdout is not closed
bool IsInputOpened() const;
bool IsInputOpened() const;
- // return
TRUE
if any input is available on the child process stdout/err
+ // return
true
if any input is available on the child process stdout/err
bool IsInputAvailable() const;
bool IsErrorAvailable() const;
bool IsInputAvailable() const;
bool IsErrorAvailable() const;
@@
-105,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
@@
-135,14
+130,12
@@
protected:
// wxProcess events
// ----------------------------------------------------------------------------
// wxProcess events
// ----------------------------------------------------------------------------
-BEGIN_DECLARE_EVENT_TYPES()
- DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_BASE const wxEventType wxEVT_END_PROCESS;
class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
{
public:
class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
{
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;
@@
-168,10
+161,10
@@
public:
typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
+#define wxProcessEventHandler(func) \
+ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(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) wxStaticCastEvent( wxProcessEventFunction, & func ), NULL),
+ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
-#endif
- // _WX_PROCESSH__
+#endif // _WX_PROCESSH__