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
This commit is contained in:
Stefan Csomor
2008-02-15 20:46:02 +00:00
parent 1dff884202
commit 8cba764cef

View File

@@ -648,11 +648,12 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
wxString wxGetOsDescription() wxString wxGetOsDescription()
{ {
#ifdef __DARWIN__ #ifdef __DARWIN__
char data[128];
struct utsname name; struct utsname name;
uname(&name); uname(&name);
sprintf(data, "Mac OS X (%s %s %s)", name.sysname, name.release, name.machine); return wxString::Format(_T("Mac OS X (%s %s %s)"),
return wxString(data, wxConvUTF8); wxString::FromAscii(name.sysname).c_str(),
wxString::FromAscii(name.release).c_str(),
wxString::FromAscii(name.machine).c_str());
#else #else
#ifdef WXWIN_OS_DESCRIPTION #ifdef WXWIN_OS_DESCRIPTION
// use configure generated description if available // use configure generated description if available