X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/163b3ad72c6729733881e74608af586a99f43726..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/unix/apptbase.h diff --git a/include/wx/unix/apptbase.h b/include/wx/unix/apptbase.h index 319efeeb09..8bf6b4cb97 100644 --- a/include/wx/unix/apptbase.h +++ b/include/wx/unix/apptbase.h @@ -12,8 +12,9 @@ #ifndef _WX_UNIX_APPTBASE_H_ #define _WX_UNIX_APPTBASE_H_ +struct wxEndProcessData; struct wxExecuteData; -class wxPipe; +class wxFDIOManager; // ---------------------------------------------------------------------------- // wxAppTraits: the Unix version adds extra hooks needed by Unix code @@ -25,29 +26,41 @@ public: // wxExecute() support methods // --------------------------- - // called before starting the child process and creates the pipe used for - // detecting the process termination asynchronously in GUI, does nothing in - // wxBase - // - // if it returns false, we should return from wxExecute() with an error - virtual bool CreateEndProcessPipe(wxExecuteData& execData) = 0; - - // test if the given descriptor is the end of the pipe create by the - // function above - virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd) = 0; - - // ensure that the write end of the pipe is not closed by wxPipe dtor - virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData) = 0; - // wait for the process termination, return whatever wxExecute() must // return - virtual int WaitForChild(wxExecuteData& execData) = 0; + // + // base class implementation handles all cases except wxEXEC_SYNC without + // wxEXEC_NOEVENTS one which is implemented at the GUI level + virtual int WaitForChild(wxExecuteData& execData); + // integrate the monitoring of the given fd with the port-specific event + // loop: when this fd, which corresponds to a dummy pipe opened between the + // parent and child processes, is closed by the child, the parent is + // notified about this via a call to wxHandleProcessTermination() function + // + // the default implementation uses wxFDIODispatcher and so is suitable for + // the console applications or ports which don't have any specific event + // loop + virtual int AddProcessCallback(wxEndProcessData *data, int fd); - // wxThread helpers - // ---------------- +#if wxUSE_SOCKETS + // return a pointer to the object which should be used to integrate + // monitoring of the file descriptors to the event loop (currently this is + // used for the sockets only but should be used for arbitrary event loop + // sources in the future) + // + // this object may be different for the console and GUI applications + // + // the pointer is not deleted by the caller as normally it points to a + // static variable + virtual wxFDIOManager *GetFDIOManager(); +#endif // wxUSE_SOCKETS - // TODO +protected: + // a helper for the implementation of WaitForChild() in wxGUIAppTraits: + // checks the streams used for redirected IO in execData and returns true + // if there is any activity in them + bool CheckForRedirectedIO(wxExecuteData& execData); }; #endif // _WX_UNIX_APPTBASE_H_