changing the defaults to the app font

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 6a6ab75b09dc42d63f0b49685127b9c37904e087..ee791190b36e81fdd819690f6baa79550e31dbcd 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -41,7 +41,7 @@ public:
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)

-        , m_faceName(wxT("Geneva"))
+        , m_faceName(wxT("applicationfont"))

         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
         , m_macFontSize(0)


@@ -49,8 +49,8 @@ public:
         , m_macATSUStyle(0)
         , m_macATSUFontID(0)
     {
         , m_macATSUStyle(0)
         , m_macATSUFontID(0)
     {

-        Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             wxT("Geneva"), wxFONTENCODING_DEFAULT);
+        Init(m_pointSize, m_family, m_style, m_weight,
+             m_underlined, m_faceName, m_encoding);

     }
 
     wxFontRefData(const wxFontRefData& data)
     }
 
     wxFontRefData(const wxFontRefData& data)