From 8cba764cefba26c0da1a4e5d2a2fb9ab2868bf52 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 15 Feb 2008 20:46:02 +0000 Subject: [PATCH] better implementation from VZ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/utils.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 01aefde677..20171b3b4d 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -648,11 +648,12 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxString wxGetOsDescription() { #ifdef __DARWIN__ - 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()); #else #ifdef WXWIN_OS_DESCRIPTION // use configure generated description if available