X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7821f944fa976adfa7a2285c0aea7c4a4a4bdcb..8f52ea33e91a7aeca6c62084faf6968c1acfaac8:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 0aefb4530a..7d1b0d14cf 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1240,7 +1240,7 @@ wxString wxLocale::GetSystemEncodingName()
 {
     wxString encname;
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);
@@ -1292,7 +1292,7 @@ wxString wxLocale::GetSystemEncodingName()
 /* static */
 wxFontEncoding wxLocale::GetSystemEncoding()
 {
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
     UINT codepage = ::GetACP();
 
     // wxWindows only knows about CP1250-1257, 932, 936, 949, 950
@@ -1364,7 +1364,7 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
                                      const wxChar *szDomain) const
 {
   if ( wxIsEmpty(szOrigString) )
-      return szDomain;
+    return _T("");
 
   const char *pszTrans = NULL;
 #if wxUSE_UNICODE