diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 634453ec6a..d6c35540fb 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -1112,7 +1112,16 @@ void wxNativeFontInfo::Init(int size, wxFontEncoding encoding) { Init(); - m_pointSize = size; + + // We should use the default font size if the special value wxDEFAULT is + // specified and we also handle -1 as a synonym for wxDEFAULT for + // compatibility with wxGTK (see #12541). + // + // Notice that we rely on the fact that wxNORMAL_FONT itself is not + // initialized using this ctor, but from native font info. + m_pointSize = size == -1 || size == wxDEFAULT + ? wxNORMAL_FONT->GetPointSize() + : size; m_family = family; m_style = style; m_weight = weight;