X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec6f69825afb90658c8b0b227ba25948527e1a82..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/common/wxchar.cpp?ds=inline

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index baa67e326d..c2deb9b203 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -189,11 +189,11 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 #endif
 
 #ifndef wxSetlocale
-WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale)
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
 {
-  setlocale(category, wxConvLibc.cWX2MB(locale));
-  // FIXME
-  return (wxChar *)NULL;
+    char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale));
+
+    return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld));
 }
 #endif