Added wxWrapperInputStream class.

[wxWidgets.git] / src / osx / core / fontenum.cpp

diff --git a/src/osx/core/fontenum.cpp b/src/osx/core/fontenum.cpp
index c7e7376ff29b05731c2cc9b2bcbec0769523e0c9..f6ff151acb80a03c54bd4470930e6ebcc082727c 100644 (file)
--- a/src/osx/core/fontenum.cpp
+++ b/src/osx/core/fontenum.cpp
@@ -65,19 +65,6 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
         status = ATSFontFamilyIteratorNext( theFontFamilyIterator, &theATSFontFamilyRef );
         if(status == noErr)
         {
- #ifndef __LP64__
-            // TODO CS : Find replacement
-            // added CS : avoid showing fonts that won't be displayable
-            FMFontStyle intrinsicStyle = 0 ;
-            FMFont fontInstance ;
-            FMFontFamily fmFamily = FMGetFontFamilyFromATSFontFamilyRef( theATSFontFamilyRef );
-            status = FMGetFontFromFontFamilyInstance( fmFamily , 0 , &fontInstance , &intrinsicStyle);
-            if ( status != noErr )
-            {
-                status = noErr;
-                continue ;
-            }
-#endif
             if ( encoding != wxFONTENCODING_SYSTEM )
             {
                 TextEncoding fontFamiliyEncoding = ATSFontFamilyGetEncoding(theATSFontFamilyRef) ;
@@ -92,7 +79,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
             wxCFStringRef cfName(theName) ;
             fontFamilies.Add(cfName.AsString(wxLocale::GetSystemEncoding()));
         }
-        else if (status == kATSIterationScopeModified) // Make sure the font database hasnÕt changed.
+        else if (status == kATSIterationScopeModified) // Make sure the font database hasn't changed.
         {
             // reset the iterator
             status = ATSFontFamilyIteratorReset (kATSFontContextLocal, nil, nil,