X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc..866a7cd7caa8470f456b4868374c9a692943dd3e:/src/os2/utilsexc.cpp diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index 909da35a3a..70e7e5a1ed 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/17/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,10 +15,9 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/log.h" - #include "wx/process.h" #include "wx/os2/private.h" @@ -129,7 +127,8 @@ MRESULT APIENTRY wxExecuteWindowCbk( HWND hWnd, long wxExecute( const wxString& rCommand, int flags, - wxProcess* pHandler) + wxProcess* pHandler, + const wxExecuteEnv *env) { if (rCommand.empty()) { @@ -157,7 +156,7 @@ long wxExecute( const wxString& rCommand, ,zArgs ,zEnvs ,&vResultCodes - ,(PSZ)rCommand.c_str() + ,rCommand.c_str() ); if (rc != NO_ERROR) { @@ -220,6 +219,7 @@ long wxExecute( char** ppArgv , int flags , wxProcess* pHandler +, const wxExecuteEnv *env ) { wxString sCommand; @@ -235,6 +235,7 @@ long wxExecute( return wxExecute( sCommand ,flags ,pHandler + , env ); }