From: Stefan Csomor Date: Fri, 15 Feb 2008 21:06:35 +0000 (+0000) Subject: better implementation from VZ X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/297218f05abc1432f355522f891145e58b9104d4 better implementation from VZ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index b52a6a01b3..e302a68cdd 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -317,8 +317,10 @@ wxString wxGetOsDescription() char data[128]; struct utsname name; uname(&name); - sprintf(data, "Mac OS X (%s %s %s)", name.sysname, name.release, name.machine); - return wxString(data, wxConvUTF8); + return wxString::Format(_T("Mac OS X (%s %s %s)"), + wxString::FromAscii(name.sysname).c_str(), + wxString::FromAscii(name.release).c_str(), + wxString::FromAscii(name.machine).c_str()); } #ifndef __DARWIN__