X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96dabe431382e288fc1ccc561f62c400895ac0fa..f5ef4d69b7fd4fb89203cd3cf9dd1e42fda7831f:/src/osx/core/fontenum.cpp diff --git a/src/osx/core/fontenum.cpp b/src/osx/core/fontenum.cpp index c7e7376ff2..f6ff151acb 100644 --- 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,