// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_FONTMAP
+#if wxUSE_FONTENUM
#include "wx/fontenum.h"
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly)
{
+ if ( fixedWidthOnly )
+ {
+ wxFAIL_MSG( "enumerating only fixed width fonts not supported" );
+ return false;
+ }
+
//
// From Apple's QA 1471 http://developer.apple.com/qa/qa2006/qa1471.html
//
-
+
ATSFontFamilyIterator theFontFamilyIterator = NULL;
ATSFontFamilyRef theATSFontFamilyRef = 0;
OSStatus status = noErr;
-
+
wxArrayString fontFamilies ;
-
+
// Create the iterator
status = ATSFontFamilyIteratorCreate(kATSFontContextLocal, nil,nil,
kATSOptionFlagsUnRestrictedScope,
&theFontFamilyIterator );
-
+
wxUint32 macEncoding = wxMacGetSystemEncFromFontEnc(encoding) ;
-
+
while (status == noErr)
{
// Get the next font in the iteration.
if ( fontFamiliyEncoding != macEncoding )
continue ;
}
-
+
// TODO: determine fixed widths ...
CFStringRef theName = NULL;
ATSFontFamilyGetName(theATSFontFamilyRef, kATSOptionFlagsDefault, &theName);
- wxMacCFStringHolder cfName(theName) ;
+ wxCFStringRef cfName(theName) ;
fontFamilies.Add(cfName.AsString(wxLocale::GetSystemEncoding()));
}
else if (status == kATSIterationScopeModified) // Make sure the font database hasnÕt changed.
}
}
ATSFontFamilyIteratorRelease(&theFontFamilyIterator);
-
+
for ( size_t i = 0 ; i < fontFamilies.Count() ; ++i )
{
if ( OnFacename( fontFamilies[i] ) == false )
break ;
}
-
+
return true;
}
-bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
+bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(family))
{
wxFAIL_MSG(wxT("wxFontEnumerator::EnumerateEncodings() not yet implemented"));
return true;
}
-#endif // wxUSE_FONTMAP
+#endif // wxUSE_FONTENUM