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

Changed defined(__DARWIN__) to (defined(__DARWIN__) && defined(__WXMAC__))

Browse Source 
wxGTK running on Darwin certainly can not use the CF process callback
and I don't plan for wxCocoa to use it either.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-04-01 17:16:59 +00:00
parent b0abe9eeec
commit edd2522079
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/unix/utilsunx.cpp
View File

@@ -544,7 +544,7 @@ long wxExecute(wxChar **argv,
wxChar **mb_argv = argv; wxChar **mb_argv = argv;
#endif // Unicode/ANSI #endif // Unicode/ANSI
#if wxUSE_GUI && !defined(__DARWIN__) #if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
// create pipes // create pipes
wxPipe pipeEndProcDetect; wxPipe pipeEndProcDetect;
if ( !pipeEndProcDetect.Create() ) if ( !pipeEndProcDetect.Create() )
@@ -555,7 +555,7 @@ long wxExecute(wxChar **argv,
return ERROR_RETURN_CODE; return ERROR_RETURN_CODE;
} }
#endif // wxUSE_GUI && !defined(__DARWIN__) #endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
// pipes for inter process communication // pipes for inter process communication
wxPipe pipeIn, // stdin wxPipe pipeIn, // stdin
@@ -606,9 +606,9 @@ long wxExecute(wxChar **argv,
if ( fd == pipeIn[wxPipe::Read] if ( fd == pipeIn[wxPipe::Read]
|| fd == pipeOut[wxPipe::Write] || fd == pipeOut[wxPipe::Write]
|| fd == pipeErr[wxPipe::Write] || fd == pipeErr[wxPipe::Write]
#if wxUSE_GUI && !defined(__DARWIN__) #if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
|| fd == pipeEndProcDetect[wxPipe::Write] || fd == pipeEndProcDetect[wxPipe::Write]
#endif // wxUSE_GUI && !defined(__DARWIN__) #endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
) )
{ {
// don't close this one, we still need it // don't close this one, we still need it
@@ -630,12 +630,12 @@ long wxExecute(wxChar **argv,
} }
#endif // !__VMS #endif // !__VMS
#if wxUSE_GUI && !defined(__DARWIN__) #if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
// reading side can be safely closed but we should keep the write one // reading side can be safely closed but we should keep the write one
// opened // opened
pipeEndProcDetect.Detach(wxPipe::Write); pipeEndProcDetect.Detach(wxPipe::Write);
pipeEndProcDetect.Close(); pipeEndProcDetect.Close();
#endif // wxUSE_GUI && !defined(__DARWIN__) #endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
// redirect stdin, stdout and stderr // redirect stdin, stdout and stderr
if ( pipeIn.IsOk() ) if ( pipeIn.IsOk() )
@@ -736,7 +736,7 @@ long wxExecute(wxChar **argv,
} }
#if defined(__DARWIN__) #if defined(__DARWIN__) && defined(__WXMAC__)
data->tag = wxAddProcessCallbackForPid(data,pid); data->tag = wxAddProcessCallbackForPid(data,pid);
#else #else
data->tag = wxAddProcessCallback data->tag = wxAddProcessCallback
@@ -746,7 +746,7 @@ long wxExecute(wxChar **argv,
); );
pipeEndProcDetect.Close(); pipeEndProcDetect.Close();
#endif // defined(__DARWIN__) #endif // defined(__DARWIN__) && defined(__WXMAC__)
if ( flags & wxEXEC_SYNC ) if ( flags & wxEXEC_SYNC )
{ {