build fixes

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 3c63ecb23b8959a6df7a7339c1311b0b5208cf43..90f88f2d00f55d9aa9bfb5d711dafeaa50c4e619 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -36,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxFont;
+    friend class wxFont;
 
 public:
     wxFontRefData()
@@ -254,6 +254,7 @@ void wxFontRefData::MacFindFont()
                         break ;
 
                     case wxMODERN :
+                    case wxTELETYPE:
                         m_faceName =  wxT("Monaco");
                         break ;
 
@@ -266,7 +267,7 @@ void wxFontRefData::MacFindFont()
                 m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
                 if ( m_macFontFamily == kInvalidFontFamily )
                 {
-                    wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName );
+                    wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName.c_str() );
                     m_macFontFamily = GetAppFont();
                 }
 #endif
@@ -554,7 +555,7 @@ wxSize wxFont::GetPixelSize() const
     dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL);
     return wxSize((int)width, (int)height);
 #else
-    wxFontBase::GetPixelSize();
+    return wxFontBase::GetPixelSize();
 #endif
 }