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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user