From cf9dd95107593ae336fc35e4100471583abac3b0 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 5 May 2008 08:16:16 +0000 Subject: [PATCH] Use fallback if passing -1 as point size (as allowed on other ports) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53452 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 9260d71154..134c2e8935 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/log.h" +#include "wx/settings.h" #include "wx/mac/private.h" @@ -188,7 +189,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;