Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Produce NFD in wxConvFileName::FromWChar() on macOS

Browse Source 
This ensures that fn_str() returns the string in the expected,
decomposed, format.

Also simplify the code by removing workarounds for old systems which are
not supported any more and make explicit the fact that under macOS
ToWChar() always produced NFC.
This commit is contained in:
Stefan Csomor
2020-07-13 12:05:29 +02:00
committed by Vadim Zeitlin
parent 47cc0b8946
commit ab858b5805
3 changed files with 42 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/strconv.cpp
View File

@@ -3307,7 +3307,7 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = wxGet_wxConvLocalPtr();
// It is important to use this conversion object under Darwin as it ensures
// that Unicode strings are (re)composed correctly even though xnu kernel uses
// decomposed form internally (at least for the file names).
static wxMBConv_cf wxConvMacUTF8DObj(wxFONTENCODING_UTF8);
static wxMBConvD_cf wxConvMacUTF8DObj(wxFONTENCODING_UTF8);
#endif
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName =