unicode compilation fix for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -149,18 +149,16 @@ int wxEntry(int argc, char **argv)
|
|||||||
|
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
wxTheApp->argv = new wxChar*[argc+1];
|
wxTheApp->argv = new wxChar*[argc+1];
|
||||||
int mb_argc = 0;
|
for ( int mb_argc = 0; mb_argc < argc; mb_argc++ )
|
||||||
while (mb_argc < argc)
|
|
||||||
{
|
{
|
||||||
wxTheApp->argv[mb_argc] = wxStrdup(wxConvLocal.cMB2WX(argv[mb_argc]));
|
wxTheApp->argv[mb_argc] = wxStrdup(wxConvLocal.cMB2WX(argv[mb_argc]));
|
||||||
mb_argc++;
|
|
||||||
}
|
}
|
||||||
wxTheApp->argv[mb_argc] = (wxChar *)NULL;
|
wxTheApp->argv[mb_argc] = (wxChar *)NULL;
|
||||||
#else
|
#else
|
||||||
wxTheApp->argv = argv;
|
wxTheApp->argv = argv;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxString name = wxFileNameFromPath(argv[0]);
|
wxString name = wxFileNameFromPath(wxTheApp->argv[0]);
|
||||||
wxStripExtension(name);
|
wxStripExtension(name);
|
||||||
wxTheApp->SetAppName(name);
|
wxTheApp->SetAppName(name);
|
||||||
|
|
||||||
@@ -231,4 +229,3 @@ static void DoCleanUp()
|
|||||||
#endif // wxUSE_LOG
|
#endif // wxUSE_LOG
|
||||||
}
|
}
|
||||||
|
|
||||||
// vi:sts=4:sw=4:et
|
|
||||||
|
Reference in New Issue
Block a user