Various wxFont fixes in wxQt

Implement point/pixel size accessors correctly.

Implement support for strike-through fonts.

Also implement DoSetNativeFontInfo() for wxQt.

Make wxFont unit test pass by accounting for Qt-specific aspects.

Closes https://github.com/wxWidgets/wxWidgets/pull/1113
This commit is contained in:
chris2oph
2019-01-09 11:17:23 +00:00
committed by Vadim Zeitlin
parent ebb50551c4
commit dd306cac77
4 changed files with 67 additions and 4 deletions

View File

@@ -439,8 +439,7 @@ bool wxFontBase::operator==(const wxFont& font) const
// in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
// operator==() resulting in infinite recursion so we can't use it
// in that port
// in wxQT, GetPixelSize is too slow to be used here
#if (!defined(__WXGTK__) || defined(__WXGTK20__)) && !defined(__WXQT__)
#if (!defined(__WXGTK__) || defined(__WXGTK20__))
GetPixelSize() == font.GetPixelSize() &&
#endif
GetFamily() == font.GetFamily() &&