X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..1cff04deb5c17c95bef9c83e72645f105b90e750:/src/mac/fontenum.cpp

diff --git a/src/mac/fontenum.cpp b/src/mac/fontenum.cpp
index e1b1347c6d..4a91e5703f 100644
--- a/src/mac/fontenum.cpp
+++ b/src/mac/fontenum.cpp
@@ -89,7 +89,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
         {
             // no such encodings at all
             return FALSE;
@@ -105,7 +105,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
 {
 	MenuHandle	menu ;
 	Str255		p_name ;
-	char        c_name[256] ;
+
 	short 		lines ;
 	
 	menu = NewMenu( 32000 , "\pFont" )  ;
@@ -115,12 +115,8 @@ void wxFontEnumeratorHelper::DoEnumerate()
 	for ( int i = 1 ; i < lines+1  ; i ++ )
 	{
 	    GetMenuItemText( menu , i , p_name ) ;
-#if TARGET_CARBON
-	    p2cstrcpy( c_name, p_name ) ;
-#else
-		p2cstr( p_name ) ;
-	    strcpy( c_name, (char *)p_name ) ;
-#endif
+	    wxString c_name = wxMacMakeStringFromPascal(p_name) ;
+
 	    /*
 	      
 	      if ( m_fixedOnly )
@@ -170,7 +166,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
-    wxFAIL_MSG(wxT("TODO"));
+    wxFAIL_MSG(wxT("wxFontEnumerator::EnumerateEncodings() not yet implemented"));
 
     return TRUE;
 }