From 5c9ea14d979b3f5efa55223eeb9c6b6b82d90fea Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Sat, 13 Nov 1999 10:27:59 +0000 Subject: [PATCH] wxGetHostName uses wxChar, not char git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/utilsres.cpp | 4 ++-- src/gtk1/utilsres.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp index 989b81dd13..ea2c8af90e 100644 --- a/src/gtk/utilsres.cpp +++ b/src/gtk/utilsres.cpp @@ -153,10 +153,10 @@ static void wxXMergeDatabases() environment = GetIniFile(filename, (const wxChar *) NULL); size_t len = wxStrlen(environment); - char hostbuf[1024]; + wxChar hostbuf[1024]; (void)wxGetHostName(hostbuf, WXSIZEOF(hostbuf) - len); - wxStrcat(environment, wxConvCurrent->cMB2WX(hostbuf)); + wxStrcat(environment, hostbuf); } if ((homeDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(environment)))) diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp index 989b81dd13..ea2c8af90e 100644 --- a/src/gtk1/utilsres.cpp +++ b/src/gtk1/utilsres.cpp @@ -153,10 +153,10 @@ static void wxXMergeDatabases() environment = GetIniFile(filename, (const wxChar *) NULL); size_t len = wxStrlen(environment); - char hostbuf[1024]; + wxChar hostbuf[1024]; (void)wxGetHostName(hostbuf, WXSIZEOF(hostbuf) - len); - wxStrcat(environment, wxConvCurrent->cMB2WX(hostbuf)); + wxStrcat(environment, hostbuf); } if ((homeDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(environment)))) -- 2.45.2