replace wxAddProcessCallback() with wxAppTraits::AddProcessCallback() to fix linking problems in Unix ports; also reduce code duplication between GUI and base versions making src/unix/baseunix.cpp unnecessary any longer

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/unix/apptbase.h

@@ -12,6 +12,7 @@
 #ifndef _WX_UNIX_APPTBASE_H_
 #define _WX_UNIX_APPTBASE_H_
 
+struct wxEndProcessData;
 struct wxExecuteData;
 class wxPipe;
 
@@ -41,7 +42,20 @@ public:
 
     // 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

include/wx/unix/apptrait.h

@@ -22,7 +22,6 @@ public:
 #if wxUSE_CONSOLE_EVENTLOOP
     virtual wxEventLoopBase *CreateEventLoop();
 #endif // wxUSE_CONSOLE_EVENTLOOP
-    virtual int WaitForChild(wxExecuteData& execData);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
@@ -35,6 +34,9 @@ class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
+#endif
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif

include/wx/unix/execute.h

@@ -15,17 +15,6 @@
 class WXDLLIMPEXP_FWD_BASE wxProcess;
 class wxStreamTempInputBuffer;
 
-// some ports have toolkit-specific implementations of wxAddProcessCallback()
-// but by default we use a generic wxFDIOHandler-based mechanism under Unix
-#if defined(__UNIX__) && \
-    !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMGL__))
-    #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
@@ -35,10 +24,6 @@ struct wxEndProcessData
     int tag;                // port dependent value
     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
@@ -82,24 +67,4 @@ struct wxExecuteData
 // callback function and is common to all ports (src/unix/utilsunx.cpp)
 extern WXDLLIMPEXP_BASE 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.
-//
-// 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
-
 #endif // _WX_UNIX_EXECUTE_H