filedata implementation streamlined

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

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 564d76de697cacaf156dfca24094659557a75792..adb3957eca576b6e4c2628997251da448d18ecc1 100644 (file)
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -23,6 +23,7 @@
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
+#include "wx/intl.h"
 
 #include "wx/mac/private.h"
 
@@ -88,7 +89,6 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 void wxFontEnumeratorHelper::DoEnumerate()
 {
     MenuHandle    menu;
-    Str255        p_name;
     short         lines;
 
     menu = NewMenu( 32000, "\pFont" );
@@ -97,8 +97,19 @@ void wxFontEnumeratorHelper::DoEnumerate()
 
     for ( int i = 1; i < lines + 1; i ++ )
     {
+        wxString c_name ;
+#if TARGET_API_MAC_CARBON
+        CFStringRef menutext ;
+        c_name = wxEmptyString ;
+        if ( CopyMenuItemTextAsCFString (menu, i, &menutext) == noErr )
+        {
+            c_name = wxMacCFStringHolder(menutext).AsString(wxLocale::GetSystemEncoding());
+        }
+#else
+        Str255        p_name;
         GetMenuItemText( menu, i, p_name );
-        wxString c_name = wxMacMakeStringFromPascal( p_name );
+        c_name = wxMacMakeStringFromPascal( p_name );
+#endif
 
 #if 0
         if ( m_fixedOnly )