X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66cd9d7f557b5847d3672507135a2d0a5882f415..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 85c4250675..66068411be 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/utilsunx.cpp +// Name: src/unix/utilsunx.cpp // Purpose: generic Unix implementation of many wx functions // Author: Vadim Zeitlin // Id: $Id$ @@ -18,36 +18,61 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" -#include "wx/string.h" +#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" +#endif -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/app.h" #include "wx/apptrait.h" -#include "wx/utils.h" #include "wx/process.h" #include "wx/thread.h" #include "wx/wfstream.h" #include "wx/unix/execute.h" +#include "wx/unix/private.h" -#if wxUSE_STREAMS +#include + +#ifdef HAVE_SYS_SELECT_H +# include +#endif + +#define HAS_PIPE_INPUT_STREAM (wxUSE_STREAMS && wxUSE_FILE) + +#if HAS_PIPE_INPUT_STREAM // define this to let wxexec.cpp know that we know what we're doing #define _WX_USED_BY_WXEXECUTE_ #include "../common/execcmn.cpp" -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM #if wxUSE_BASE -#if defined( __MWERKS__ ) && defined(__MACH__) -#define WXWIN_OS_DESCRIPTION "MacOS X" -#define HAVE_NANOSLEEP -#define HAVE_UNAME +#if defined(__MWERKS__) && defined(__MACH__) + #ifndef WXWIN_OS_DESCRIPTION + #define WXWIN_OS_DESCRIPTION "MacOS X" + #endif + #ifndef HAVE_NANOSLEEP + #define HAVE_NANOSLEEP + #endif + #ifndef HAVE_UNAME + #define HAVE_UNAME + #endif + + // our configure test believes we can use sigaction() if the function is + // available but Metrowekrs with MSL run-time does have the function but + // doesn't have sigaction struct so finally we can't use it... + #ifdef __MSL__ + #undef wxUSE_ON_FATAL_EXCEPTION + #define wxUSE_ON_FATAL_EXCEPTION 0 + #endif #endif // not only the statfs syscall is called differently depending on platform, but @@ -64,6 +89,11 @@ #endif // __BSD__/!__BSD__ #define wxStatfs statfs + + #ifndef HAVE_STATFS_DECL + // some systems lack statfs() prototype in the system headers (AIX 4) + extern "C" int statfs(const char *path, struct statfs *buf); + #endif #endif // HAVE_STATFS #ifdef HAVE_STATVFS @@ -90,7 +120,6 @@ #include #include #include -#include #include #include #include @@ -103,6 +132,12 @@ #include // for uname() #endif // HAVE_UNAME +// Used by wxGetFreeMemory(). +#ifdef __SGI__ + #include + #include // for SAGET and MINFO structures +#endif + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -111,26 +146,22 @@ // headers - please add your system here if it is the case for your OS. // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this. #if !defined(HAVE_USLEEP) && \ - (defined(__SUN__) && !defined(__SunOs_5_6) && \ + ((defined(__SUN__) && !defined(__SunOs_5_6) && \ !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ - defined(__osf__) || defined(__EMX__) + defined(__osf__) || defined(__EMX__)) extern "C" { - #ifdef __SUN__ + #ifdef __EMX__ + /* I copied this from the XFree86 diffs. AV. */ + #define INCL_DOSPROCESS + #include + inline void usleep(unsigned long delay) + { + DosSleep(delay ? (delay/1000l) : 1l); + } + #else // Unix int usleep(unsigned int usec); - #else // !Sun - #ifdef __EMX__ - /* I copied this from the XFree86 diffs. AV. */ - #define INCL_DOSPROCESS - #include - inline void usleep(unsigned long delay) - { - DosSleep(delay ? (delay/1000l) : 1l); - } - #else // !Sun && !EMX - void usleep(unsigned long usec); - #endif - #endif // Sun/EMX/Something else + #endif // __EMX__/Unix }; #define HAVE_USLEEP 1 @@ -185,12 +216,12 @@ void wxMilliSleep(unsigned long milliseconds) // process management // ---------------------------------------------------------------------------- -int wxKill(long pid, wxSignal sig, wxKillError *rc) +int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags) { - int err = kill((pid_t)pid, (int)sig); + int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig); if ( rc ) { - switch ( errno ) + switch ( err ? errno : 0 ) { case 0: *rc = wxKILL_OK; @@ -222,9 +253,16 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) #define WXEXECUTE_NARGS 127 +#if defined(__DARWIN__) +long wxMacExecute(wxChar **argv, + int flags, + wxProcess *process); +#endif + long wxExecute( const wxString& command, int flags, wxProcess *process ) { - wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); + wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty command") ); + wxLogDebug(wxString(wxT("Launching: ")) + command); #if wxUSE_THREADS // fork() doesn't mix well with POSIX threads: on many systems the program @@ -241,12 +279,12 @@ long wxExecute( const wxString& command, int flags, wxProcess *process ) wxString argument; const wxChar *cptr = command.c_str(); wxChar quotechar = wxT('\0'); // is arg quoted? - bool escaped = FALSE; + bool escaped = false; // split the command line in arguments do { - argument=wxT(""); + argument = wxEmptyString; quotechar = wxT('\0'); // eat leading whitespace: @@ -260,14 +298,14 @@ long wxExecute( const wxString& command, int flags, wxProcess *process ) { if ( *cptr == wxT('\\') && ! escaped ) { - escaped = TRUE; + escaped = true; cptr++; continue; } // all other characters: argument += *cptr++; - escaped = FALSE; + escaped = false; // have we reached the end of the argument? if ( (*cptr == quotechar && ! escaped) @@ -291,8 +329,18 @@ long wxExecute( const wxString& command, int flags, wxProcess *process ) } while(*cptr); argv[argc] = NULL; + long lRc; +#if defined(__DARWIN__) + // wxMacExecute only executes app bundles. + // It returns an error code if the target is not an app bundle, thus falling + // through to the regular wxExecute for non app bundles. + lRc = wxMacExecute(argv, flags, process); + if( lRc != ((flags & wxEXEC_SYNC) ? -1 : 0)) + return lRc; +#endif + // do execute the command - long lRc = wxExecute(argv, flags, process); + lRc = wxExecute(argv, flags, process); // clean up argc = 0; @@ -330,7 +378,7 @@ bool wxShell(const wxString& command) bool wxShell(const wxString& command, wxArrayString& output) { - wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") ); + wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") ); return wxExecute(wxMakeShellCommand(command), output); } @@ -351,23 +399,22 @@ bool wxShutdown(wxShutdownFlags wFlags) default: wxFAIL_MSG( _T("unknown wxShutdown() flag") ); - return FALSE; + return false; } return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; } - // ---------------------------------------------------------------------------- // wxStream classes to support IO redirection in wxExecute // ---------------------------------------------------------------------------- -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM bool wxPipeInputStream::CanRead() const { if ( m_lasterror == wxSTREAM_EOF ) - return FALSE; + return false; // check if there is any input available struct timeval tv; @@ -377,8 +424,10 @@ bool wxPipeInputStream::CanRead() const const int fd = m_file->fd(); fd_set readfds; - FD_ZERO(&readfds); - FD_SET(fd, &readfds); + + wxFD_ZERO(&readfds); + wxFD_SET(fd, &readfds); + switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) { case -1: @@ -386,7 +435,7 @@ bool wxPipeInputStream::CanRead() const // fall through case 0: - return FALSE; + return false; default: wxFAIL_MSG(_T("unexpected select() return value")); @@ -400,19 +449,13 @@ bool wxPipeInputStream::CanRead() const } } -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM // ---------------------------------------------------------------------------- // wxExecute: the real worker function // ---------------------------------------------------------------------------- -#ifdef __VMS - #pragma message disable codeunreachable -#endif - -long wxExecute(wxChar **argv, - int flags, - wxProcess *process) +long wxExecute(wxChar **argv, int flags, wxProcess *process) { // for the sync execution, we return -1 to indicate failure, but for async // case we return 0 which is never a valid PID @@ -590,16 +633,16 @@ long wxExecute(wxChar **argv, // prepare for IO redirection -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM // the input buffer bufOut is connected to stdout, this is why it is // called bufOut and not bufIn wxStreamTempInputBuffer bufOut, bufErr; -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM if ( process && process->IsRedirected() ) { -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM wxOutputStream *inStream = new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); @@ -616,7 +659,7 @@ long wxExecute(wxChar **argv, execData.bufOut = &bufOut; execData.bufErr = &bufErr; -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM } if ( pipeIn.IsOk() ) @@ -629,12 +672,10 @@ long wxExecute(wxChar **argv, return traits->WaitForChild(execData); } +#if !defined(__VMS) && !defined(__INTEL_COMPILER) return ERROR_RETURN_CODE; -} - -#ifdef __VMS - #pragma message enable codeunreachable #endif +} #undef ERROR_RETURN_CODE #undef ARGS_CLEANUP @@ -645,9 +686,9 @@ long wxExecute(wxChar **argv, const wxChar* wxGetHomeDir( wxString *home ) { - *home = wxGetUserHome( wxString() ); + *home = wxGetUserHome( wxEmptyString ); wxString tmp; - if ( home->IsEmpty() ) + if ( home->empty() ) *home = wxT("/"); #ifdef __VMS tmp = *home; @@ -701,12 +742,41 @@ char *wxGetUserHome( const wxString &user ) // network and user id routines // ---------------------------------------------------------------------------- +// private utility function which returns output of the given command, removing +// the trailing newline +static wxString wxGetCommandOutput(const wxString &cmd) +{ + FILE *f = popen(cmd.ToAscii(), "r"); + if ( !f ) + { + wxLogSysError(_T("Executing \"%s\" failed"), cmd.c_str()); + return wxEmptyString; + } + + wxString s; + char buf[256]; + while ( !feof(f) ) + { + if ( !fgets(buf, sizeof(buf), f) ) + break; + + s += wxString::FromAscii(buf); + } + + pclose(f); + + if ( !s.empty() && s.Last() == _T('\n') ) + s.RemoveLast(); + + return s; +} + // retrieve either the hostname or FQDN depending on platform (caller must // check whether it's one or the other, this is why this function is for // private use only) static bool wxGetHostNameInternal(wxChar *buf, int sz) { - wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") ); + wxCHECK_MSG( buf, false, wxT("NULL pointer in wxGetHostNameInternal") ); *buf = wxT('\0'); @@ -724,7 +794,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz) #else // no uname, no gethostname wxFAIL_MSG(wxT("don't know host name for this machine")); - bool ok = FALSE; + bool ok = false; #endif // uname/gethostname if ( !ok ) @@ -767,7 +837,7 @@ bool wxGetFullHostName(wxChar *buf, int sz) { wxLogSysError(_("Cannot get the official hostname")); - ok = FALSE; + ok = false; } else { @@ -789,10 +859,10 @@ bool wxGetUserId(wxChar *buf, int sz) if ((who = getpwuid(getuid ())) != NULL) { wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); - return TRUE; + return true; } - return FALSE; + return false; } bool wxGetUserName(wxChar *buf, int sz) @@ -811,22 +881,60 @@ bool wxGetUserName(wxChar *buf, int sz) #else // !HAVE_PW_GECOS wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS - return TRUE; + return true; } - return FALSE; + return false; } -// this function is in mac/utils.cpp for wxMac +bool wxIsPlatform64Bit() +{ + wxString machine = wxGetCommandOutput(wxT("uname -m")); + + // NOTE: these tests are not 100% reliable! + return machine.Contains(wxT("AMD64")) || + machine.Contains(wxT("IA64")) || + machine.Contains(wxT("x64")) || + machine.Contains(wxT("X64")) || + machine.Contains(wxT("alpha")) || + machine.Contains(wxT("hppa64")) || + machine.Contains(wxT("ppc64")); +} + +// these functions are in mac/utils.cpp for wxMac #ifndef __WXMAC__ +wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) +{ + // get OS version + int major, minor; + wxString release = wxGetCommandOutput(wxT("uname -r")); + if ( !release.empty() && wxSscanf(release, wxT("%d.%d"), &major, &minor) != 2 ) + { + // unrecognized uname string format + major = + minor = -1; + } + + if ( verMaj ) + *verMaj = major; + if ( verMin ) + *verMin = minor; + + // try to understand which OS are we running + wxString kernel = wxGetCommandOutput(wxT("uname -s")); + if ( kernel.empty() ) + kernel = wxGetCommandOutput(wxT("uname -o")); + + if ( kernel.empty() ) + return wxOS_UNKNOWN; + + return wxPlatformInfo::GetOperatingSystemId(kernel); +} + wxString wxGetOsDescription() { -#ifndef WXWIN_OS_DESCRIPTION - #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure -#else - return wxString::FromAscii( WXWIN_OS_DESCRIPTION ); -#endif + return wxGetCommandOutput(wxT("uname -s -r -m")); } #endif // !__WXMAC__ @@ -836,7 +944,7 @@ unsigned long wxGetProcessId() return (unsigned long)getpid(); } -long wxGetFreeMemory() +wxMemorySize wxGetFreeMemory() { #if defined(__LINUX__) // get it from /proc/meminfo @@ -848,16 +956,43 @@ long wxGetFreeMemory() char buf[1024]; if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) ) { - long memTotal, memUsed; - sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree); + // /proc/meminfo changed its format in kernel 2.6 + if ( wxPlatformInfo().CheckOSVersion(2, 6) ) + { + unsigned long cached, buffers; + sscanf(buf, "MemFree: %ld", &memFree); + + fgets(buf, WXSIZEOF(buf), fp); + sscanf(buf, "Buffers: %lu", &buffers); + + fgets(buf, WXSIZEOF(buf), fp); + sscanf(buf, "Cached: %lu", &cached); + + // add to "MemFree" also the "Buffers" and "Cached" values as + // free(1) does as otherwise the value never makes sense: for + // kernel 2.6 it's always almost 0 + memFree += buffers + cached; + + // values here are always expressed in kB and we want bytes + memFree *= 1024; + } + else // Linux 2.4 (or < 2.6, anyhow) + { + long memTotal, memUsed; + sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree); + } } fclose(fp); - return memFree; + return (wxMemorySize)memFree; } #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES) - return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE); + return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE)); +#elif defined(__SGI__) + struct rminfo realmem; + if ( sysmp(MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0 ) + return ((wxMemorySize)realmem.physmem * sysconf(_SC_PAGESIZE)); //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably #endif @@ -865,7 +1000,7 @@ long wxGetFreeMemory() return -1; } -bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) +bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree) { #if defined(HAVE_STATFS) || defined(HAVE_STATVFS) // the case to "char *" is needed for AIX 4.3 @@ -874,30 +1009,30 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { wxLogSysError( wxT("Failed to get file system statistics") ); - return FALSE; + return false; } // under Solaris we also have to use f_frsize field instead of f_bsize // which is in general a multiple of f_frsize #ifdef HAVE_STATVFS - wxLongLong blockSize = fs.f_frsize; + wxDiskspaceSize_t blockSize = fs.f_frsize; #else // HAVE_STATFS - wxLongLong blockSize = fs.f_bsize; + wxDiskspaceSize_t blockSize = fs.f_bsize; #endif // HAVE_STATVFS/HAVE_STATFS if ( pTotal ) { - *pTotal = wxLongLong(fs.f_blocks) * blockSize; + *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize; } if ( pFree ) { - *pFree = wxLongLong(fs.f_bavail) * blockSize; + *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize; } - return TRUE; + return true; #else // !HAVE_STATFS && !HAVE_STATVFS - return FALSE; + return false; #endif // HAVE_STATFS } @@ -910,14 +1045,14 @@ bool wxGetEnv(const wxString& var, wxString *value) // wxGetenv is defined as getenv() wxChar *p = wxGetenv(var); if ( !p ) - return FALSE; + return false; if ( value ) { *value = p; } - return TRUE; + return true; } bool wxSetEnv(const wxString& variable, const wxChar *value) @@ -967,13 +1102,13 @@ extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER) bool wxHandleFatalExceptions(bool doit) { // old sig handlers - static bool s_savedHandlers = FALSE; + static bool s_savedHandlers = false; static struct sigaction s_handlerFPE, s_handlerILL, s_handlerBUS, s_handlerSEGV; - bool ok = TRUE; + bool ok = true; if ( doit && !s_savedHandlers ) { // install the signal handler @@ -995,7 +1130,7 @@ bool wxHandleFatalExceptions(bool doit) wxLogDebug(_T("Failed to install our signal handler.")); } - s_savedHandlers = TRUE; + s_savedHandlers = true; } else if ( s_savedHandlers ) { @@ -1009,7 +1144,7 @@ bool wxHandleFatalExceptions(bool doit) wxLogDebug(_T("Failed to uninstall our signal handler.")); } - s_savedHandlers = FALSE; + s_savedHandlers = false; } //else: nothing to do @@ -1018,40 +1153,6 @@ bool wxHandleFatalExceptions(bool doit) #endif // wxUSE_ON_FATAL_EXCEPTION -// ---------------------------------------------------------------------------- -// error and debug output routines (deprecated, use wxLog) -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_2 - -void wxDebugMsg( const char *format, ... ) -{ - va_list ap; - va_start( ap, format ); - vfprintf( stderr, format, ap ); - fflush( stderr ); - va_end(ap); -} - -void wxError( const wxString &msg, const wxString &title ) -{ - wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, wxT(".\n") ); -} - -void wxFatalError( const wxString &msg, const wxString &title ) -{ - wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, wxT(".\n") ); - exit(3); // the same exit code as for abort() -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif // wxUSE_BASE #if wxUSE_GUI @@ -1106,10 +1207,12 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) { wxEndProcessData *endProcData = new wxEndProcessData; + const int flags = execData.flags; + // wxAddProcessCallback is now (with DARWIN) allowed to call the // callback function directly if the process terminates before // the callback can be added to the run loop. Set up the endProcData. - if ( execData.flags & wxEXEC_SYNC ) + if ( flags & wxEXEC_SYNC ) { // we may have process for capturing the program output, but it's // not used in wxEndProcessData in the case of sync execution @@ -1128,7 +1231,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) } -#if defined(__DARWIN__) && defined(__WXMAC__) +#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); #else endProcData->tag = wxAddProcessCallback @@ -1138,12 +1241,13 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) ); execData.pipeEndProcDetect.Close(); -#endif // defined(__DARWIN__) && defined(__WXMAC__) +#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) - if ( execData.flags & wxEXEC_SYNC ) + if ( flags & wxEXEC_SYNC ) { wxBusyCursor bc; - wxWindowDisabler wd; + wxWindowDisabler *wd = flags & wxEXEC_NODISABLE ? NULL + : new wxWindowDisabler; // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the // process terminates @@ -1151,7 +1255,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) { bool idle = true; -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM if ( execData.bufOut ) { execData.bufOut->Update(); @@ -1163,12 +1267,12 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) execData.bufErr->Update(); idle = false; } -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM - // don't consume 100% of the CPU while we're sitting this in this + // don't consume 100% of the CPU while we're sitting in this // loop if ( idle ) - wxUsleep(1); + wxMilliSleep(1); // give GTK+ a chance to call GTK_EndProcessDetector here and // also repaint the GUI @@ -1177,6 +1281,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) int exitcode = endProcData->exitcode; + delete wd; delete endProcData; return exitcode;