Merge remote-tracking branch 'remotes/origin/ys_bf_msw_scale'

This commit is contained in:
bubnikv 2019-08-20 16:53:23 +02:00
commit c8a78f5d85
3 changed files with 55 additions and 20 deletions

View file

@ -39,10 +39,12 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
{
// Fonts were created by the DPIFrame constructor for the monitor, on which the window opened.
wxGetApp().update_fonts(this);
/*
#ifndef __WXOSX__ // Don't call SetFont under OSX to avoid name cutting in ObjectList
this->SetFont(this->normal_font());
#endif
// Font is already set in DPIFrame constructor
*/
// Load the icon either from the exe, or from the ico file.
#if _WIN32
{