setup font defines for iphone correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index 4115fba7a95322da7f1442bd121a12af432e7e4b..3d20a2299437c5a29179bafcb92c95da3cb8bd9b 100644 (file)
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -94,11 +94,20 @@
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 

+#ifdef __WXASPEN__
+#define wxMAC_USE_CG_TEXT 1
+#define wxMAC_USE_CORE_TEXT 0
+#define wxMAC_USE_ATSU_TEXT 0
+#else

 #define wxMAC_USE_CORE_TEXT 1
 #define wxMAC_USE_ATSU_TEXT 0
 #define wxMAC_USE_CORE_TEXT 1
 #define wxMAC_USE_ATSU_TEXT 0

+#define wxMAC_USE_CG_TEXT 0
+#endif

 
 #else // platform < 10.5
 
 
 #else // platform < 10.5
 

+#define wxMAC_USE_CG_TEXT 0
+

 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 #define wxMAC_USE_CORE_TEXT 1
 #else
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 #define wxMAC_USE_CORE_TEXT 1
 #else


@@ -108,9 +117,6 @@
 
 #endif
 
 
 #endif
 

-// pure coregraphics text
-#define wxMAC_USE_CG_TEXT 0
-

 /*
  * turning off capabilities that don't work under 64 bit yet
  */
 /*
  * turning off capabilities that don't work under 64 bit yet
  */