From d299ddd2f27a437f0fc0cb49abdfd6dd8e3d94f8 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 2 Feb 2021 11:44:31 -0500 Subject: add upstream 11.6 --- wx+/font_size.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wx+/font_size.h') diff --git a/wx+/font_size.h b/wx+/font_size.h index d25dfede..da74eada 100644 --- a/wx+/font_size.h +++ b/wx+/font_size.h @@ -33,7 +33,7 @@ inline void setRelativeFontSize(wxWindow& control, double factor) { wxFont font = control.GetFont(); - font.SetPointSize(numeric::round(wxNORMAL_FONT->GetPointSize() * factor)); + font.SetPointSize(std::round(wxNORMAL_FONT->GetPointSize() * factor)); control.SetFont(font); } @@ -42,7 +42,7 @@ inline void setMainInstructionFont(wxWindow& control) { wxFont font = control.GetFont(); - font.SetPointSize(numeric::round(wxNORMAL_FONT->GetPointSize() * 12.0 / 11)); + font.SetPointSize(std::round(wxNORMAL_FONT->GetPointSize() * 12.0 / 11)); font.SetWeight(wxFONTWEIGHT_BOLD); control.SetFont(font); -- cgit