wxBase/GUI separation: 1st step, wxMSW should build, all the rest is broken
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,6 +10,11 @@
|
||||
#ifndef _WX_UNIX_EXECUTE_H
|
||||
#define _WX_UNIX_EXECUTE_H
|
||||
|
||||
#include "wx/unix/pipe.h"
|
||||
|
||||
class wxProcess;
|
||||
class wxStreamTempInputBuffer;
|
||||
|
||||
// if pid > 0, the execution is async and the data is freed in the callback
|
||||
// executed when the process terminates, if pid < 0, the execution is
|
||||
// synchronous and the caller (wxExecute) frees the data
|
||||
@@ -21,6 +26,43 @@ struct wxEndProcessData
|
||||
int exitcode; // the exit code
|
||||
};
|
||||
|
||||
// struct in which information is passed from wxExecute() to wxAppTraits
|
||||
// methods
|
||||
struct wxExecuteData
|
||||
{
|
||||
wxExecuteData()
|
||||
{
|
||||
flags =
|
||||
pid = 0;
|
||||
|
||||
process = NULL;
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
bufOut =
|
||||
bufErr = NULL;
|
||||
#endif // wxUSE_STREAMS
|
||||
}
|
||||
|
||||
// wxExecute() flags
|
||||
int flags;
|
||||
|
||||
// the pid of the child process
|
||||
int pid;
|
||||
|
||||
// the associated process object or NULL
|
||||
wxProcess *process;
|
||||
|
||||
// pipe used for end process detection
|
||||
wxPipe pipeEndProcDetect;
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
// the input buffer bufOut is connected to stdout, this is why it is
|
||||
// called bufOut and not bufIn
|
||||
wxStreamTempInputBuffer *bufOut,
|
||||
*bufErr;
|
||||
#endif // wxUSE_STREAMS
|
||||
};
|
||||
|
||||
// this function is called when the process terminates from port specific
|
||||
// callback function and is common to all ports (src/unix/utilsunx.cpp)
|
||||
extern void wxHandleProcessTermination(wxEndProcessData *proc_data);
|
||||
@@ -28,6 +70,7 @@ extern void wxHandleProcessTermination(wxEndProcessData *proc_data);
|
||||
// this function is called to associate the port-specific callback with the
|
||||
// child process. The return valus is port-specific.
|
||||
extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd);
|
||||
|
||||
// For ports (e.g. DARWIN) which can add callbacks based on the pid
|
||||
extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid);
|
||||
|
||||
|
Reference in New Issue
Block a user