projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fix for --disable-ffile.
[wxWidgets.git]
/
include
/
wx
/
process.h
diff --git
a/include/wx/process.h
b/include/wx/process.h
index 6b54ca0a675069ebe9e1c3fc096b8a9b14824607..298a209b8c04d00eb6f745ee5534b471e9faaac2 100644
(file)
--- a/
include/wx/process.h
+++ b/
include/wx/process.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: process.h
+// Name:
wx/
process.h
// Purpose: wxProcess class
// Author: Guilhem Lavaux
// Modified by: Vadim Zeitlin to check error codes, added Detach() method
// Purpose: wxProcess class
// Author: Guilhem Lavaux
// Modified by: Vadim Zeitlin to check error codes, added Detach() method
@@
-12,10
+12,6
@@
#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
@@
-66,6
+62,9
@@
public:
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);
// may be overridden to be notified about process termination
virtual void OnTerminate(int pid, int status);
@@
-105,15
+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
- wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );
-#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
@@
-167,10
+163,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, wxID_ANY, \
- (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxProcessEventFunction, & func ), NULL),
+ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
-#endif
- // _WX_PROCESSH__
+#endif // _WX_PROCESSH__