X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..7cfebe05f03443c6f91197f93cd2749270df6666:/src/mac/fontenum.cpp

diff --git a/src/mac/fontenum.cpp b/src/mac/fontenum.cpp
index f06fd5baaa..4720cc4a75 100644
--- a/src/mac/fontenum.cpp
+++ b/src/mac/fontenum.cpp
@@ -37,6 +37,8 @@
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 
+#include "wx/mac/private.h"
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -87,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;
@@ -102,7 +104,8 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 void wxFontEnumeratorHelper::DoEnumerate()
 {
 	MenuHandle	menu ;
-	Str255		name ;
+	Str255		p_name ;
+	char        c_name[256] ;
 	short 		lines ;
 	
 	menu = NewMenu( 32000 , "\pFont" )  ;
@@ -111,11 +114,16 @@ void wxFontEnumeratorHelper::DoEnumerate()
 
 	for ( int i = 1 ; i < lines+1  ; i ++ )
 	{
-		GetMenuItemText( menu , i , name ) ;
-		p2cstr( name ) ;
-		/*
-		
-		    if ( m_fixedOnly )
+	    GetMenuItemText( menu , i , p_name ) ;
+#if TARGET_CARBON
+	    p2cstrcpy( c_name, p_name ) ;
+#else
+		p2cstr( p_name ) ;
+	    strcpy( c_name, (char *)p_name ) ;
+#endif
+	    /*
+	      
+	      if ( m_fixedOnly )
 	    {
 	        // check that it's a fixed pitch font (there is *no* error here, the
 	        // flag name is misleading!)
@@ -136,7 +144,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
 	    }
 	
 		*/
-		m_fontEnum->OnFacename( name ) ;
+		m_fontEnum->OnFacename( c_name ) ;
 	}
 	DisposeMenu( menu ) ;
 }