X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d553c56c979f9a9817282795bc563c3c16e5cdc..1996c23f8c7255c51aacc8f1a2f8f904d440ea4f:/src/mac/corefoundation/utilsexc_cf.cpp

diff --git a/src/mac/corefoundation/utilsexc_cf.cpp b/src/mac/corefoundation/utilsexc_cf.cpp
index 8ab34dd12b..a3f55509be 100644
--- a/src/mac/corefoundation/utilsexc_cf.cpp
+++ b/src/mac/corefoundation/utilsexc_cf.cpp
@@ -6,7 +6,7 @@
 // Created:     2004-11-04
 // RCS-ID:      $Id$
 // Copyright:   (c) David Elliott
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 // Notes:       This code comes from src/mac/carbon/utilsexc.cpp,1.11
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,6 +16,8 @@
     #include "wx/utils.h"
 #endif //ndef WX_PRECOMP
 #include "wx/unix/execute.h"
+#include "wx/stdpaths.h"
+#include "wx/apptrait.h"
 
 #include <CoreFoundation/CFMachPort.h>
 #include <sys/wait.h>
@@ -25,20 +27,20 @@ extern "C" {
 
 void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
 {
-	wxEndProcessData *proc_data = (wxEndProcessData*)data;
-	wxLogDebug(wxT("Wow.. this actually worked!"));
-	int status = 0;
-	int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
-	if(!rc)
-	{
-		wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
-		return;
-	}
-	if((rc != -1) && WIFEXITED(status))
-		proc_data->exitcode = WEXITSTATUS(status);
-	else
-		proc_data->exitcode = -1;
-	wxHandleProcessTermination(proc_data);
+    wxEndProcessData *proc_data = (wxEndProcessData*)data;
+    wxLogDebug(wxT("Wow.. this actually worked!"));
+    int status = 0;
+    int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
+    if(!rc)
+    {
+    	wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
+    	return;
+    }
+    if((rc != -1) && WIFEXITED(status))
+    	proc_data->exitcode = WEXITSTATUS(status);
+    else
+    	proc_data->exitcode = -1;
+    wxHandleProcessTermination(proc_data);
 }
 
 int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
@@ -109,3 +111,11 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     return 0;
 }
 
+// NOTE: This doens't really belong here but this was a handy file to
+// put it in because it's already compiled for wxCocoa and wxMac GUI lib.
+static wxStandardPathsCF gs_stdPaths;
+wxStandardPathsBase& wxGUIAppTraits::GetStandardPaths()
+{
+    return gs_stdPaths;
+}
+