splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index b52a6a01b3abb43c4e61d13089fe8e9e83c36eb3..e302a68cdd15bad134a14efb658bcda4e00ef076 100644 (file)
--- 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);
     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__
 }
 
 #ifndef __DARWIN__