projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...
[wxWidgets.git]
/
include
/
wx
/
process.h
diff --git
a/include/wx/process.h
b/include/wx/process.h
index 03993984bb662415d68fbe5e3629fe0efeb940ab..b372d7235fd1300a9a9df1057b30fccad53f4f51 100644
(file)
--- a/
include/wx/process.h
+++ b/
include/wx/process.h
@@
-6,13
+6,13
@@
// Created: 24/06/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Guilhem Lavaux
// 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__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "process.h"
#endif
#pragma interface "process.h"
#endif
@@
-39,11
+39,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);
@@
-59,10
+59,10
@@
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();
@@
-72,7
+72,7
@@
public:
// 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
// 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
+88,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
@@
-100,8
+107,7
@@
public:
// for backwards compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
// 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); }
+ wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
#endif // WXWIN_COMPATIBILITY_2_2
protected:
@@
-121,6
+127,7
@@
protected:
bool m_redirect;
DECLARE_DYNAMIC_CLASS(wxProcess)
bool m_redirect;
DECLARE_DYNAMIC_CLASS(wxProcess)
+ DECLARE_NO_COPY_CLASS(wxProcess)
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-128,13
+135,13
@@
protected:
// ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES()
// ----------------------------------------------------------------------------
BEGIN_DECLARE_EVENT_TYPES()
- DECLARE_E
VENT_TYPE(
wxEVT_END_PROCESS, 440)
+ DECLARE_E
XPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE,
wxEVT_END_PROCESS, 440)
END_DECLARE_EVENT_TYPES()
END_DECLARE_EVENT_TYPES()
-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
+162,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) \
+ (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) \
- (wxProcessEventFunction) & func, NULL),
+ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
-#endif
- // _WX_PROCESSH__
+#endif // _WX_PROCESSH__