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

Backport modified 49154 from trunk. Normalizes multiple and incorrect usage

Browse Source 
of darwin/mac/cocoa tests into one USE_OLD_DARWIN_END_PROCESS_DETECT which
now excludes wxCocoa since it will be using the new method.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-10-19 02:42:42 +00:00
parent 5e093a9bb5
commit 0e3d1f4af5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/unix/utilsunx.cpp
View File

@@ -1170,13 +1170,18 @@ bool wxHandleFatalExceptions(bool doit)
#if wxUSE_GUI #if wxUSE_GUI
#ifdef __DARWIN__
#include <sys/errno.h>
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxExecute support // wxExecute support
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Darwin doesn't use the same process end detection mechanisms so we don't #define USE_OLD_DARWIN_END_PROCESS_DETECT (defined(__DARWIN__) && defined(__WXMAC__))
// need wxExecute-related helpers for it
#if !(defined(__DARWIN__) && defined(__WXMAC__)) // wxMac doesn't use the same process end detection mechanisms so we don't
// need wxExecute-related helpers for it.
#if !USE_OLD_DARWIN_END_PROCESS_DETECT
bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData) bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
{ {
@@ -1244,7 +1249,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
} }
#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) #if USE_OLD_DARWIN_END_PROCESS_DETECT
endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
#else #else
endProcData->tag = wxAddProcessCallback endProcData->tag = wxAddProcessCallback
@@ -1254,7 +1259,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
); );
execData.pipeEndProcDetect.Close(); execData.pipeEndProcDetect.Close();
#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) #endif // USE_OLD_DARWIN_END_PROCESS_DETECT
if ( flags & wxEXEC_SYNC ) if ( flags & wxEXEC_SYNC )
{ {