Applied patch [ 1443707 ] kill "cast truncates constant value" warnings

[wxWidgets.git] / src / mac / corefoundation / utilsexc_cf.cpp

diff --git a/src/mac/corefoundation/utilsexc_cf.cpp b/src/mac/corefoundation/utilsexc_cf.cpp
index 353263ab9204a8062722dcabcb8936e9584371ef..12f26671c083311af375a6eb3a42a9ec875bdc76 100644 (file)
--- a/src/mac/corefoundation/utilsexc_cf.cpp
+++ b/src/mac/corefoundation/utilsexc_cf.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/mac/corefoundation/utilsexec_cf.cpp
 // Purpose:     Execution-related utilities for Darwin
-// Author:      David Elliott
+// Author:      David Elliott, Ryan Norton (wxMacExecute)
 // Modified by: Stefan Csomor (added necessary wxT for unicode builds)
 // Created:     2004-11-04
 // RCS-ID:      $Id$
-// Copyright:   (c) David Elliott
+// Copyright:   (c) David Elliott, Ryan Norton
 // Licence:     wxWindows licence
 // Notes:       This code comes from src/mac/carbon/utilsexc.cpp,1.11
 /////////////////////////////////////////////////////////////////////////////
@@ -16,6 +16,10 @@
     #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>
@@ -26,7 +30,7 @@ extern "C" {
 void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
 {
     wxEndProcessData *proc_data = (wxEndProcessData*)data;
-    wxLogDebug(wxT("Wow.. this actually worked!"));
+    wxLogDebug(wxT("Process ended"));
     int status = 0;
     int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
     if(!rc)
@@ -69,7 +73,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
         return -1;
     }
     CFMachPortContext termcb_contextinfo;
-    termcb_contextinfo.version = NULL;
+    termcb_contextinfo.version = 0;
     termcb_contextinfo.info = (void*)proc_data;
     termcb_contextinfo.retain = NULL;
     termcb_contextinfo.release = NULL;
@@ -109,3 +113,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;
+}
+