From 85a9228394a1172e778cdd48db590b533c0132ba Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 26 Apr 2011 22:57:33 +0000 Subject: [PATCH] Make wxSMALL_FONT larger under MSW as it was unreadable otherwise. The default size of the normal font is 9pt under MSW and 7pt is too small for wxSMALL_FONT, use 8pt for it instead. Closes #13104. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/gdicmn.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index e87361656b..b6325e6d15 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -655,7 +655,19 @@ const wxFont* wxStockGDI::GetFont(Item item) font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); break; case FONT_SMALL: - font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL); + font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() + // Using the font 2 points smaller than the normal one + // results in font so small as to be unreadable under MSW. + // We might want to actually use -1 under the other + // platforms too but for now be conservative and keep -2 + // there for compatibility with the old behaviour as the + // small font seems to be readable enough there as it is. +#ifdef __WXMSW__ + - 1, +#else + - 2, +#endif + wxSWISS, wxNORMAL, wxNORMAL); break; case FONT_SWISS: font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL); -- 2.45.2