fixed bug in mouse handling

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index d7d7b12cc80f13b69df3531fd0a86bd03102be4e..4f26c04f914e3bfab6d22d3655d28981ec364b68 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -79,7 +79,7 @@ void wxFontRefData::MacFindFont()
                                ::GetFNum( "\pTimes" , &m_macFontNum) ;
                                break ;
                        case wxSWISS :
-                               ::GetFNum( "\pHelvetica" , &m_macFontNum) ;
+                               ::GetFNum( "\pGeneva" , &m_macFontNum) ;
                                break ;
                        case wxMODERN :
                                ::GetFNum( "\pMonaco" , &m_macFontNum) ;
@@ -149,6 +149,15 @@ bool wxFont::RealizeResource()
     return TRUE;
 }
 
+void wxFont::SetEncoding(wxFontEncoding encoding)
+{
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+
+    RealizeResource();
+}
+
 void wxFont::Unshare()
 {
        // Don't change shared data
@@ -232,11 +241,6 @@ int wxFont::GetFamily() const
     return M_FONTDATA->m_family;
 }
 
-int wxFont::GetFontId() const
-{
-    return M_FONTDATA->m_fontId;
-}
-
 int wxFont::GetStyle() const
 {
     return M_FONTDATA->m_style;