From 0d8dda3216192a8b18f20c6e718dd1d52721bcb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 7 Jul 2003 08:56:16 +0000 Subject: [PATCH] Unicode compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 4 ++-- src/gtk1/app.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index b7ce136139..8ded6a5944 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -706,7 +706,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #if wxUSE_UNICODE // gtk_init() wants UTF-8, not wchar_t, so convert int i; - char *argvGTK = new char *[argc + 1]; + char **argvGTK = new char *[argc + 1]; for ( i = 0; i < argc; i++ ) { argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); @@ -722,7 +722,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // we have to drop the parameters which were consumed by GTK+ for ( i = 0; i < argcGTK; i++ ) { - while ( wxStrcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 ) + while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 ) { memmove(argv + i, argv + i + 1, argc - i); } diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index b7ce136139..8ded6a5944 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -706,7 +706,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #if wxUSE_UNICODE // gtk_init() wants UTF-8, not wchar_t, so convert int i; - char *argvGTK = new char *[argc + 1]; + char **argvGTK = new char *[argc + 1]; for ( i = 0; i < argc; i++ ) { argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); @@ -722,7 +722,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // we have to drop the parameters which were consumed by GTK+ for ( i = 0; i < argcGTK; i++ ) { - while ( wxStrcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 ) + while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 ) { memmove(argv + i, argv + i + 1, argc - i); } -- 2.45.2