X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6b1d97e741fda8d579fa21cbc89f0c91615cef..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/fontenum.cpp?ds=sidebyside

diff --git a/src/mac/fontenum.cpp b/src/mac/fontenum.cpp
index f296efd93c..14491d79e9 100644
--- a/src/mac/fontenum.cpp
+++ b/src/mac/fontenum.cpp
@@ -33,7 +33,9 @@
 #endif
 
 #include "wx/fontenum.h"
+#include "wx/fontutil.h"
 #include "wx/fontmap.h"
+#include "wx/fontutil.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -100,7 +102,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" )  ;
@@ -109,11 +112,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!)
@@ -134,7 +142,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
 	    }
 	
 		*/
-		m_fontEnum->OnFacename( name ) ;
+		m_fontEnum->OnFacename( c_name ) ;
 	}
 	DisposeMenu( menu ) ;
 }