added test for wxScopeGuard

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 6a6ab75b09dc42d63f0b49685127b9c37904e087..8029ee53ec56c28b274779f6c31aaf12360f6b94 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_faceName(wxT("Geneva"))
+        , m_faceName(wxT("applicationfont"))
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
         , m_macFontSize(0)
@@ -49,8 +49,8 @@ public:
         , 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)
@@ -129,7 +129,7 @@ public:
     
     // ATSU Font Information
     
-    // this is splitted into an ATSU font id that may
+    // this is split into an ATSU font id that may
     // contain some styles (special bold fonts etc) and
     // these are the additional qd styles that are not
     // included in the ATSU font id