From daf944909ce9d12bf786bcb2752c5edf03ef7c36 Mon Sep 17 00:00:00 2001 From: ARATA Mizuki Date: Mon, 22 Feb 2016 03:19:49 +0900 Subject: [PATCH] Use wxChar16 instead of wxDecodeSurrogate_t for UTF-16 unit type in wxDecodeSurrogate --- src/common/strconv.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 867d663f99..480d16251a 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -122,18 +122,12 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output) } } -#ifdef WC_UTF16 - typedef wchar_t wxDecodeSurrogate_t; -#else // !WC_UTF16 - typedef wxUint16 wxDecodeSurrogate_t; -#endif // WC_UTF16/!WC_UTF16 - // returns the next UTF-32 character from the wchar_t buffer and advances the // pointer to the character after this one // // if an invalid character is found, *pSrc is set to NULL, the caller must // check for this -static wxUint32 wxDecodeSurrogate(const wxDecodeSurrogate_t **pSrc) +static wxUint32 wxDecodeSurrogate(const wxChar16 **pSrc) { wxUint32 out; const size_t