From 6de9282600f340da051d0b3e195ffb8dff037760 Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Fri, 23 Jul 1999 09:48:04 +0000 Subject: [PATCH] Convert argv[] to Unicode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 12 +++++++++++- src/gtk1/app.cpp | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index a690ab53a4..17838772fb 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -690,7 +690,17 @@ int wxEntry( int argc, char *argv[] ) wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); wxTheApp->argc = argc; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; + int mb_argc = 0; + while (mb_argc < argc) { + wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); + mb_argc++; + } + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else wxTheApp->argv = argv; +#endif wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); @@ -781,7 +791,7 @@ wxApp::GetStdIcon(int which) const return wxIcon(warning_xpm); default: - wxFAIL_MSG("requested non existent standard icon"); + wxFAIL_MSG(_T("requested non existent standard icon")); // still fall through case wxICON_HAND: diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index a690ab53a4..17838772fb 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -690,7 +690,17 @@ int wxEntry( int argc, char *argv[] ) wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); wxTheApp->argc = argc; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; + int mb_argc = 0; + while (mb_argc < argc) { + wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); + mb_argc++; + } + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else wxTheApp->argv = argv; +#endif wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); @@ -781,7 +791,7 @@ wxApp::GetStdIcon(int which) const return wxIcon(warning_xpm); default: - wxFAIL_MSG("requested non existent standard icon"); + wxFAIL_MSG(_T("requested non existent standard icon")); // still fall through case wxICON_HAND: -- 2.50.0