From 4f4684d77da239a84e339c0f58eaa01f5da487d2 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 5 May 2008 08:16:58 +0000 Subject: [PATCH] Use fallback when passing -1 for point size (as allowed by other ports) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/font.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index e5ebd6dc39..d069f3c89e 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -23,6 +23,7 @@ #include "wx/fontutil.h" #include "wx/graphics.h" +#include "wx/settings.h" #include "wx/mac/uma.h" @@ -209,7 +210,7 @@ void wxFontRefData::Init(int pointSize, wxFontEncoding encoding) { m_style = style; - m_pointSize = pointSize; + m_pointSize = (pointSize == -1) ? wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize() : pointSize; m_family = family; m_style = style; m_weight = weight; -- 2.45.2