Merge branch 'font-fixes'

Complete support for fractional point sizes and font weights other than
light/bold.

Also harmonize wxFont API and implementation among all ports (fixing
compilation of those of them that were broken by recent changes).

See https://github.com/wxWidgets/wxWidgets/pull/919
This commit is contained in:
Vadim Zeitlin
2018-09-17 22:58:56 +02:00
55 changed files with 1730 additions and 1311 deletions

View File

@@ -337,8 +337,7 @@ void MyCanvas::CreateCaret()
void MyCanvas::SetFontSize(int fontSize)
{
m_font = wxFont(fontSize, wxFONTFAMILY_TELETYPE,
wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
m_font = wxFont(wxFontInfo(fontSize).Family(wxFONTFAMILY_TELETYPE));
wxClientDC dc(this);
dc.SetFont(m_font);