X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/598fe99d56158319f6b5f817c4670748f98bc70a..ee3de647ffd5891138864d032bc0f2bd5a130ef0:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index abab0a651a..0610186a21 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -636,7 +635,8 @@ bool wxDoSetEnv(const wxString& var, const wxChar *value) envstr += '='; if ( value ) envstr += value; - _tputenv(envstr.t_str()); + if ( _tputenv(envstr.t_str()) != 0 ) + return false; #else // other compiler if ( !::SetEnvironmentVariable(var.t_str(), value) ) { @@ -1103,14 +1103,14 @@ bool wxLoadUserResource(const void **outData, size_t *outLen, const wxString& resourceName, - const wxString& resourceType, + const wxChar* resourceType, WXHINSTANCE instance) { wxCHECK_MSG( outData && outLen, false, "output pointers can't be NULL" ); HRSRC hResource = ::FindResource(instance, resourceName.t_str(), - resourceType.t_str()); + resourceType); if ( !hResource ) return false; @@ -1139,7 +1139,7 @@ wxLoadUserResource(const void **outData, char * wxLoadUserResource(const wxString& resourceName, - const wxString& resourceType, + const wxChar* resourceType, int* pLen, WXHINSTANCE instance) {