diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-08-20 17:53:23 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-08-20 17:53:23 +0300 |
| commit | c8a78f5d85cc79bc41823e5dd5dee8c0a8051e49 (patch) | |
| tree | 2f380b623996134079b9391b25e3059a0bc6c0c9 /src/slic3r/GUI/MainFrame.cpp | |
| parent | 88dcb7f366324225e715a67fa231fff0bda584a4 (diff) | |
| parent | 12133f95993ba33064b059e971f27e02fcc046d8 (diff) | |
Merge remote-tracking branch 'remotes/origin/ys_bf_msw_scale'
Diffstat (limited to 'src/slic3r/GUI/MainFrame.cpp')
| -rw-r--r-- | src/slic3r/GUI/MainFrame.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index f10a106c1..12a38d2fc 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -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 { |