Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxExecute for ports other than wxMac and wxCocoa on Darwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-10-24 07:36:16 +00:00
parent db93f8f85b
commit f7ef06022c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/unix/execute.h
View File

@@ -71,7 +71,7 @@ extern void wxHandleProcessTermination(wxEndProcessData *proc_data);
// child process. The return valus is port-specific. // child process. The return valus is port-specific.
extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd); 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 // For ports (e.g. DARWIN) which can add callbacks based on the pid
extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid); extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid);
#endif #endif

4
src/unix/utilsunx.cpp
View File

@@ -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); endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
#else #else
endProcData->tag = wxAddProcessCallback endProcData->tag = wxAddProcessCallback
@@ -1153,7 +1153,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
); );
execData.pipeEndProcDetect.Close(); execData.pipeEndProcDetect.Close();
#endif // defined(__DARWIN__) #endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
if ( execData.flags & wxEXEC_SYNC ) if ( execData.flags & wxEXEC_SYNC )
{ {