From d51bad0347a36d9524e6e5d208bcbb9a2ee3c4f0 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 20 Oct 2002 10:10:56 +0000 Subject: [PATCH] Don't use libc for converting the command line params to Unicode as it will crash. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 5 +++-- src/gtk1/app.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 5100ef3060..d22e01df61 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -756,7 +756,7 @@ int wxEntryInitGui() retValue = -1; wxGetRootWindow(); - + return retValue; } @@ -818,7 +818,8 @@ int wxEntry( int argc, char *argv[] ) int mb_argc = 0; while (mb_argc < argc) { - wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); + wxString tmp = wxString::FromAscii( argv[mb_argc] ); + wxTheApp->argv[mb_argc] = wxStrdup( tmp.c_str() ); mb_argc++; } wxTheApp->argv[mb_argc] = (wxChar *)NULL; diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 5100ef3060..d22e01df61 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -756,7 +756,7 @@ int wxEntryInitGui() retValue = -1; wxGetRootWindow(); - + return retValue; } @@ -818,7 +818,8 @@ int wxEntry( int argc, char *argv[] ) int mb_argc = 0; while (mb_argc < argc) { - wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); + wxString tmp = wxString::FromAscii( argv[mb_argc] ); + wxTheApp->argv[mb_argc] = wxStrdup( tmp.c_str() ); mb_argc++; } wxTheApp->argv[mb_argc] = (wxChar *)NULL;