X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7af284fda7500594b2ab86c8ba60138164ab4d04..4aaef122cbbd5bbe0e70b824e320458e2329dd13:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 82656dd1d2..bd39f333b0 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -408,9 +408,61 @@ WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
 // - move wxEncodingConverter meat in here
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
+
+#if wxUSE_GUI
+
+// VZ: the new version of wxCharsetToCodepage() is more politically correct
+//     and should work on other Windows versions as well but the old version is
+//     still needed for !wxUSE_FONTMAP || !wxUSE_GUI case
+
+extern long wxEncodingToCodepage(wxFontEncoding encoding)
+{
+    // translate encoding into the Windows CHARSET
+    wxNativeEncodingInfo natveEncInfo;
+    if ( !wxGetNativeFontEncoding(encoding, &natveEncInfo) )
+        return -1;
+
+    // translate CHARSET to code page
+    CHARSETINFO csetInfo;
+    if ( !::TranslateCharsetInfo((DWORD *)(DWORD)natveEncInfo.charset,
+                                 &csetInfo,
+                                 TCI_SRCCHARSET) )
+    {
+        wxLogLastError(_T("TranslateCharsetInfo(TCI_SRCCHARSET)"));
+
+        return -1;
+    }
+
+    return csetInfo.ciACP;
+}
+
+#if wxUSE_FONTMAP
+
+extern long wxCharsetToCodepage(const wxChar *name)
+{
+    // first get the font encoding for this charset
+    if ( !name )
+        return -1;
+
+    wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return -1;
+
+    // the use the helper function
+    return wxEncodingToCodepage(enc);
+}
+
+#endif // wxUSE_FONTMAP
+
+#endif // wxUSE_GUI
+
+// include old wxCharsetToCodepage() by OK if needed
+#if !wxUSE_GUI || !wxUSE_FONTMAP
+
 #include "wx/msw/registry.h"
-// this should work if M$ Internet Exploiter is installed
-static long CharsetToCodepage(const wxChar *name)
+
+// this should work if Internet Exploiter is installed
+extern long wxCharsetToCodepage(const wxChar *name)
 {
     if (!name)
         return GetACP();
@@ -440,7 +492,10 @@ static long CharsetToCodepage(const wxChar *name)
 
     return CP;
 }
-#endif
+
+#endif // !wxUSE_GUI || !wxUSE_FONTMAP
+
+#endif // Win32
 
 class wxCharacterSet
 {
@@ -641,7 +696,7 @@ public:
         size_t outbuf = n;
         size_t res, cres;
         
-        wchar_t *tmpbuf;
+        wchar_t *tmpbuf = 0;
 
         if (g_wcNeedsSwap)
         {
@@ -709,13 +764,16 @@ protected:
 class CP_CharSet : public wxCharacterSet
 {
 public:
-    CP_CharSet(const wxChar*name)
-        : wxCharacterSet(name), CodePage(CharsetToCodepage(name)) {}
+    CP_CharSet(const wxChar* name)
+        : wxCharacterSet(name)
+        {
+            m_CodePage = wxCharsetToCodepage(name);
+        }
 
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
     {
         size_t len =
-            MultiByteToWideChar(CodePage, 0, psz, -1, buf, buf ? n : 0);
+            MultiByteToWideChar(m_CodePage, 0, psz, -1, buf, buf ? n : 0);
         //VS: returns # of written chars for buf!=NULL and *size*
         //    needed buffer for buf==NULL
         return len ? (buf ? len : len-1) : (size_t)-1;
@@ -723,7 +781,7 @@ public:
 
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
     {
-        size_t len = WideCharToMultiByte(CodePage, 0, psz, -1, buf,
+        size_t len = WideCharToMultiByte(m_CodePage, 0, psz, -1, buf,
                                          buf ? n : 0, NULL, NULL);
         //VS: returns # of written chars for buf!=NULL and *size*
         //    needed buffer for buf==NULL
@@ -731,10 +789,10 @@ public:
     }
 
     bool usable()
-        { return CodePage != -1; }
+        { return m_CodePage != -1; }
 
 public:
-    long CodePage;
+    long m_CodePage;
 };
 #endif // __WIN32__
 
@@ -745,8 +803,8 @@ class EC_CharSet : public wxCharacterSet
 public:
     // temporarily just use wxEncodingConverter stuff,
     // so that it works while a better implementation is built
-    EC_CharSet(const wxChar*name) : wxCharacterSet(name),
-                                    enc(wxFONTENCODING_SYSTEM)
+    EC_CharSet(const wxChar* name) : wxCharacterSet(name),
+                                     enc(wxFONTENCODING_SYSTEM)
     {
         if (name)
             enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
@@ -764,7 +822,8 @@ public:
 
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
     {
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
         size_t inbuf = std::wcslen(psz);
 #else
         size_t inbuf = ::wcslen(psz);
@@ -898,7 +957,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         return m_cset->WC2MB(buf, psz, n);
 
     // latin-1 (direct)
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
     size_t len=std::wcslen(psz);
 #else
     size_t len=::wcslen(psz);