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:
@@ -489,7 +489,7 @@ bool MyGLCanvas::oglInit()
|
||||
int swi = 0, shi = 0; //Image sizes
|
||||
wxString stg("wxWidgets");
|
||||
// Set the font. Use a big pointsize so as to smoothing edges.
|
||||
wxFont font(48, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
|
||||
wxFont font(wxFontInfo(48).Family(wxFONTFAMILY_MODERN));
|
||||
if ( !font.IsOk() )
|
||||
font = *wxSWISS_FONT;
|
||||
wxColour bgrdColo(*wxBLACK);
|
||||
|
Reference in New Issue
Block a user