diff options
author | B Stack <bgstack15@gmail.com> | 2021-02-02 21:49:34 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2021-02-02 21:49:34 +0000 |
commit | 26b8bd6eb07b78adad36049e03494a2931b231af (patch) | |
tree | 4d7c950512836f473a6a8cbb521c61e800db6584 /wx+/font_size.h | |
parent | Merge branch '11.5' into 'master' (diff) | |
parent | add upstream 11.6 (diff) | |
download | FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.tar.gz FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.tar.bz2 FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.zip |
Merge branch '11.6' into 'master'11.6
add upstream 11.6
See merge request opensource-tracking/FreeFileSync!30
Diffstat (limited to 'wx+/font_size.h')
-rw-r--r-- | wx+/font_size.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |