wxGetHostName uses wxChar, not char

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 989b81dd13e345c9f05040e381851e4181afe00d..ea2c8af90e2ea6c85a639958dd1ac60714308782 100644 (file)
--- 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 989b81dd13e345c9f05040e381851e4181afe00d..ea2c8af90e2ea6c85a639958dd1ac60714308782 100644 (file)
--- 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))))