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

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 5c76164d10d4cf305b2a1783570802b96eb12d73..d0cb4c4ae24cbfed53892e3defbe74fc4f9fa889 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -544,7 +544,7 @@ long wxExecute(wxChar **argv,
     wxChar **mb_argv = argv;
 #endif // Unicode/ANSI
 
     wxChar **mb_argv = argv;
 #endif // Unicode/ANSI
 

-#if wxUSE_GUI && !defined(__DARWIN__)
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))

     // create pipes
     wxPipe pipeEndProcDetect;
     if ( !pipeEndProcDetect.Create() )
     // create pipes
     wxPipe pipeEndProcDetect;
     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
     wxPipe pipeIn,      // stdin
 
     // pipes for inter process communication
     wxPipe pipeIn,      // stdin


@@ -606,9 +606,9 @@ long wxExecute(wxChar **argv,
                 if ( fd == pipeIn[wxPipe::Read]
                         || fd == pipeOut[wxPipe::Write]
                         || fd == pipeErr[wxPipe::Write]
                 if ( fd == pipeIn[wxPipe::Read]
                         || fd == pipeOut[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
         // opened
         pipeEndProcDetect.Detach(wxPipe::Write);
         pipeEndProcDetect.Close();
         // reading side can be safely closed but we should keep the write one
         // opened
         pipeEndProcDetect.Detach(wxPipe::Write);
         pipeEndProcDetect.Close();

-#endif // wxUSE_GUI && !defined(__DARWIN__)
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))

 
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )
 
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )


@@ -736,7 +736,7 @@ long wxExecute(wxChar **argv,
         }
 
 
         }
 
 

-#if defined(__DARWIN__)
+#if defined(__DARWIN__) && defined(__WXMAC__)

         data->tag = wxAddProcessCallbackForPid(data,pid);
 #else
         data->tag = wxAddProcessCallback
         data->tag = wxAddProcessCallbackForPid(data,pid);
 #else
         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 )
         {