X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50a743c9e44893725a4ffd56af4853797b3768dd..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/init.cpp diff --git a/src/common/init.cpp b/src/common/init.cpp index 326ef09333..ee3847634f 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -179,7 +179,11 @@ static void ConvertArgsToUnicode(int argc, char **argv) int wargc = 0; for ( int i = 0; i < argc; i++ ) { +#ifdef __DARWIN__ + wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i])); +#else wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i])); +#endif if ( !buf ) { wxLogWarning(_("Command line argument %d couldn't be converted to Unicode and will be ignored."), @@ -294,6 +298,12 @@ bool wxEntryStart(int& argc, wxChar **argv) return false; } + // remember, possibly modified (e.g. due to removal of toolkit-specific + // parameters), command line arguments in member variables + app->argc = argc; + app->argv = argv; + + wxCallAppCleanup callAppCleanup(app.get()); // for compatibility call the old initialization function too