Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed Unicode compilation and run-time problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-01 00:29:47 +00:00
parent 80c29153f2
commit 150cb19558
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/init.cpp
View File

@@ -141,7 +141,7 @@ static struct InitData
// them to Unicode ourselves (this is the case under Unix but not Windows, // them to Unicode ourselves (this is the case under Unix but not Windows,
// for example), we remember the converted argv here because we'll have to // for example), we remember the converted argv here because we'll have to
// free it when doing cleanup to avoid memory leaks // free it when doing cleanup to avoid memory leaks
wchar_t *argv; wchar_t **argv;
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
} gs_initData; } gs_initData;
@@ -168,9 +168,15 @@ static void ConvertArgsToUnicode(int argc, char **argv)
static void FreeConvertedArgs() static void FreeConvertedArgs()
{ {
for ( int mb_argc = 0; mb_argc < wxTheApp->argc; mb_argc++ ) if ( gs_initData.argv )
{ {
free(wxTheApp->argv[mb_argc]); for ( int i = 0; i < gs_initData.argc; i++ )
{
free(gs_initData.argv[i]);
}
delete [] gs_initData.argv;
gs_initData.argv = NULL;
} }
} }