From 331dc1fdfe3aa1a2df6c0fa97ffe2bd2c92b2b24 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Wed, 12 Dec 2018 09:59:49 +0000 Subject: [PATCH] Change wxFont::GetEncoding to return UTF8 for wxQt QT doesn't have the concept of font encoding and is generally Unicode aware throughout. The previous implementation of wxFont::GetEncoding for wxQT returned a nonsensical value. Closes https://github.com/wxWidgets/wxWidgets/pull/1070 --- src/qt/font.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qt/font.cpp b/src/qt/font.cpp index 7e328d099a..c01903ec42 100644 --- a/src/qt/font.cpp +++ b/src/qt/font.cpp @@ -451,10 +451,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const wxFontEncoding wxNativeFontInfo::GetEncoding() const { -// QFontInfo info = QFontInfo(m_qtFont); - wxMISSING_IMPLEMENTATION( __FUNCTION__ ); - - return wxFONTENCODING_MAX; + return wxFONTENCODING_UTF8; } void wxNativeFontInfo::SetFractionalPointSize(float pointsize)