added wxWindow::HasFocus() for more convenient way of determining if a (possibly...

[wxWidgets.git] / include / wx / unix / execute.h

diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h
index 745674ec601fddb45ca54f59dc7645056ef2077c..25376c0cddf04e68aad3a2168f452d20d73c7b53 100644 (file)
--- a/include/wx/unix/execute.h
+++ b/include/wx/unix/execute.h
@@ -12,18 +12,30 @@
 
 #include "wx/unix/pipe.h"
 
 
 #include "wx/unix/pipe.h"
 

-class wxProcess;
+class WXDLLIMPEXP_FWD_BASE wxProcess;

 class wxStreamTempInputBuffer;
 
 class wxStreamTempInputBuffer;
 

+#if defined(__WXDFB__) || defined(__WXX11__)
+    #define wxHAS_GENERIC_PROCESS_CALLBACK 1
+#endif
+
+#ifdef wxHAS_GENERIC_PROCESS_CALLBACK
+struct wxEndProcessFDIOHandler;
+#endif
+

 // 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
 struct wxEndProcessData
 {
 // 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
 struct wxEndProcessData
 {

-    int pid,                // pid of the process
-        tag;                // port dependent value
+    int pid;                // pid of the process
+    int tag;                // port dependent value

     wxProcess *process;     // if !NULL: notified on process termination
     int  exitcode;          // the exit code
     wxProcess *process;     // if !NULL: notified on process termination
     int  exitcode;          // the exit code

+
+#ifdef wxHAS_GENERIC_PROCESS_CALLBACK
+    wxEndProcessFDIOHandler *fdioHandler;
+#endif

 };
 
 // struct in which information is passed from wxExecute() to wxAppTraits
 };
 
 // struct in which information is passed from wxExecute() to wxAppTraits


@@ -65,13 +77,24 @@ struct wxExecuteData
 
 // this function is called when the process terminates from port specific
 // callback function and is common to all ports (src/unix/utilsunx.cpp)
 
 // 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);
+extern WXDLLIMPEXP_BASE void wxHandleProcessTermination(wxEndProcessData *proc_data);

 
 

-// this function is called to associate the port-specific callback with the
+// This function is called to associate the port-specific callback with the

 // child process. The return valus is port-specific.
 // child process. The return valus is port-specific.

-extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd);
-
-#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
+//
+// The file descriptor 'fd' is descriptor of a dummy pipe opened between the
+// parent and the child. No data are written to or read from this pipe, its
+// sole purpose is that the child process will close it when it terminates and
+// the parent will be notified about it if it looks at 'fd' (e.g. using
+// select()).
+//
+// wxAddProcessCallback() does whatever is necessary to ensure that 'fd' is
+// periodically (typically every event loop iteration) checked for its status
+// and that wxHandleProcessTermination() is called once 'fd' indicates the
+// child terminated.
+extern WXDLLIMPEXP_CORE int wxAddProcessCallback(wxEndProcessData *proc_data, int fd);
+
+#if defined(__WXMAC__) || defined(__WXCOCOA__)

 // For ports (e.g. DARWIN) which can add callbacks based on the pid
 extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid);
 #endif
 // For ports (e.g. DARWIN) which can add callbacks based on the pid
 extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid);
 #endif