X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63660cba0acbdefc2ac156ef74e899146d98c1c4..d10fdec4b7f7c58c8a8571e9d87b5800710eb422:/src/osx/core/fontenum.cpp?ds=sidebyside

diff --git a/src/osx/core/fontenum.cpp b/src/osx/core/fontenum.cpp
index c4326e8319..658701bc82 100644
--- a/src/osx/core/fontenum.cpp
+++ b/src/osx/core/fontenum.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,6 +30,10 @@
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 
+#if wxOSX_USE_IPHONE
+extern CFArrayRef CopyAvailableFontFamilyNames();
+#endif
+
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
@@ -41,14 +44,15 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 #if wxOSX_USE_CORE_TEXT
     {
         CFArrayRef cfFontFamilies = nil;
-        
+
+#if wxOSX_USE_COCOA_OR_CARBON
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
         if ( UMAGetSystemVersion() >= 0x1060 )
             cfFontFamilies = CTFontManagerCopyAvailableFontFamilyNames();
         else
 #endif
         {
-#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6) && wxOSX_USE_ATSU_TEXT
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6)
             //
             // From Apple's QA 1471 http://developer.apple.com/qa/qa2006/qa1471.html
             //
@@ -89,6 +93,9 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
             cfFontFamilies = atsfontnames;
 #endif
         }
+#elif wxOSX_USE_IPHONE
+        cfFontFamilies = CopyAvailableFontFamilyNames();
+#endif
         
         CFIndex count = CFArrayGetCount(cfFontFamilies);
         for(CFIndex i = 0; i < count; i++)