From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 10 Apr 2006 23:53:09 +0000 (+0000)
Subject: use wxConvLocal for wxFONTENCODING_SYSTEM/DEFAULT in wxConvertToGTK()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/12bc5f9ad2c8be40081dbe69d0c0042fb30cbfa5

use wxConvLocal for wxFONTENCODING_SYSTEM/DEFAULT in wxConvertToGTK()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index d0fd5c36a0..35dd71d871 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -190,7 +190,16 @@ wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
         return wxCharBuffer(s);
     }
 
-    const wxWCharBuffer wbuf = wxCSConv(enc).cMB2WC(s);
+    wxWCharBuffer wbuf;
+    if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
+    {
+        wbuf = wxConvLocal.cMB2WC(s);
+    }
+    else // another encoding, use generic conversion class
+    {
+        wbuf = wxCSConv(enc).cMB2WC(s);
+    }
+
     wxCharBuffer buf;
     if ( wbuf )
         buf = wxConvUTF8.cWC2MB(wbuf);