Accept "underlinedstrikethrough" in wxFont user strings

Due to a bug fixed in 78145f9162 converting a
font which was both underlined and stricken-through to a user string resulted
in using this space-less version and while the bug is fixed now, still accept
the strings created while it was there on input, it doesn't cost much and
results in a better user experience.

See https://github.com/wxWidgets/wxWidgets/pull/187
This commit is contained in:
Daniel Kulp
2016-02-22 23:10:29 +01:00
committed by Vadim Zeitlin
parent 16a67283a0
commit 54a64fc549

View File

@@ -981,6 +981,11 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
{
SetStrikethrough(true);
}
else if ( token == wxT("underlinedstrikethrough") )
{
SetUnderlined(true);
SetStrikethrough(true);
}
else if ( token == wxT("light") || token == _("light") )
{
SetWeight(wxFONTWEIGHT_LIGHT);