X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..fde0548028e2fab4f0ade53f472e9d6f101c29f6:/src/os2/utilsexc.cpp diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index 5df7c70697..da80a3b213 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -6,7 +6,7 @@ // Created: 10/17/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -88,7 +88,7 @@ static ULONG wxExecuteThread( ); if (ulRc != NO_ERROR) { - wxLogLastError("DosWaitChild"); + wxLogLastError(wxT("DosWaitChild")); } delete pData; return 0; @@ -195,7 +195,7 @@ long wxExecute( ); if (rc != NO_ERROR) { - wxLogLastError("CreateThread in wxExecute"); + wxLogLastError(wxT("CreateThread in wxExecute")); delete pData; // the process still started up successfully... @@ -231,7 +231,10 @@ long wxExecute( while (*ppArgv != NULL) { - sCommand << *ppArgv++ << ' '; + wxString sArg((wxChar*)(*ppArgv++)); + + + sCommand << sArg.c_str() << ' '; } sCommand.RemoveLast(); return wxExecute( sCommand @@ -263,7 +266,7 @@ bool wxGetFullHostName( strncpy(zBuf, zComputer, nMaxSize); zBuf[nMaxSize] = _T('\0'); #else - strcpy(zBuf, "noname"); + strcpy((char*)zBuf, "noname"); #endif return *zBuf ? TRUE : FALSE; return TRUE;