X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b556b005eddd5bf5d04f01eaba6b313d8305d1a..594ed110f77d9f29f7165a07bb806e5a4fa19b0e:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index b32ce87d3d..67e446e66e 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -2238,6 +2238,8 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     {
         return wxFONTENCODING_CP950;
     }
+#elif defined(__WXMAC__)
+    return wxMacGetFontEncFromSystemEnc( CFStringGetSystemEncoding() ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     wxString encname = GetSystemEncodingName();
     if ( !encname.empty() )
@@ -2420,15 +2422,15 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
             if ( szDomain != NULL )
             {
                 wxLogTrace(_T("i18n"),
-                           _T("string '%s'[%ld] not found in domain '%s' for locale '%s'."),
-                           szOrigString, n, szDomain, m_strLocale.c_str());
+                           _T("string '%s'[%d] not found in domain '%s' for locale '%s'."),
+                           szOrigString, (int)n, szDomain, m_strLocale.c_str());
 
             }
             else
             {
                 wxLogTrace(_T("i18n"),
-                           _T("string '%s'[%ld] not found in locale '%s'."),
-                           szOrigString, n, m_strLocale.c_str());
+                           _T("string '%s'[%d] not found in locale '%s'."),
+                           szOrigString, (int)n, m_strLocale.c_str());
             }
         }
 #endif // __WXDEBUG__