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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index e5ebd6dc39b6510952c043805f1c15217221d422..d069f3c89e996e7e28394dd4c862c609d6a823b3 100644 (file)
--- 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/fontutil.h"
 #include "wx/graphics.h"

+#include "wx/settings.h"

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -209,7 +210,7 @@ void wxFontRefData::Init(int pointSize,
     wxFontEncoding encoding)
 {
     m_style = style;
     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;
     m_family = family;
     m_style = style;
     m_weight = weight;