Fix wxExecute for ports other than wxMac and wxCocoa on Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
db93f8f85b
commit
f7ef06022c
@ -71,7 +71,7 @@ extern void wxHandleProcessTermination(wxEndProcessData *proc_data);
|
||||
// child process. The return valus is port-specific.
|
||||
extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd);
|
||||
|
||||
#if defined(__DARWIN__)
|
||||
#if defined(__DARWIN__) && (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
|
||||
|
@ -1143,7 +1143,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
|
||||
}
|
||||
|
||||
|
||||
#if defined(__DARWIN__)
|
||||
#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
|
||||
endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
|
||||
#else
|
||||
endProcData->tag = wxAddProcessCallback
|
||||
@ -1153,7 +1153,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
|
||||
);
|
||||
|
||||
execData.pipeEndProcDetect.Close();
|
||||
#endif // defined(__DARWIN__)
|
||||
#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
|
||||
|
||||
if ( execData.flags & wxEXEC_SYNC )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user