CoreText is always available on 10.5+, so using all this code unconditionally, committing Vadim's suggestions with two extensions, see #15580

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-19 19:27:29 +00:00
parent f91544e613
commit e39c9f5914
11 changed files with 74 additions and 418 deletions
--- a/include/wx/osx/carbon/chkconf.h
+++ b/include/wx/osx/carbon/chkconf.h
@@ -30,7 +30,6 @@
 * text rendering system
 */

-#define wxOSX_USE_CORE_TEXT 1
 #define wxOSX_USE_ATSU_TEXT 1

 /*
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -41,7 +41,6 @@
 * text rendering system
 */

-#define wxOSX_USE_CORE_TEXT 1
 #define wxOSX_USE_ATSU_TEXT 0

 /*
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -152,9 +152,7 @@ public:
    CGFontRef OSXGetCGFont() const;
 #endif

-#if wxOSX_USE_CORE_TEXT
    CTFontRef OSXGetCTFont() const;
-#endif

 #if wxOSX_USE_ATSU_TEXT
    // Returns an ATSUStyle not ATSUStyle*
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -19,7 +19,6 @@
 * under a certain platform
 */

-#define wxOSX_USE_CORE_TEXT 1
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES