Remove ATSU-related dead code from wxOSX

ATSU was deprecated for a long time and was finally removed from OS X
SDK in 10.11. wxOSX_USE_ATSU_TEXT was unconditionally disabled already,
so the code was never used and can be safely removed.
This commit is contained in:
Václav Slavík
2016-12-03 12:44:10 +01:00
parent 40a04218f4
commit c9b1ebf816
6 changed files with 0 additions and 334 deletions

View File

@@ -158,21 +158,10 @@ public:
wxFontEncoding encoding);
void Free();
void EnsureValid();
static void UpdateNamesMap(const wxString& familyname, CTFontDescriptorRef descr);
static void UpdateNamesMap(const wxString& familyname, CTFontRef font);
bool m_descriptorValid;
#if wxOSX_USE_ATSU_TEXT
bool m_atsuFontValid;
// the atsu font ID
wxUint32 m_atsuFontID;
// the qd styles that are not intrinsic to the font above
wxInt16 m_atsuAdditionalQDStyles;
#endif
int m_pointSize;
wxFontFamily m_family;
wxFontStyle m_style;

View File

@@ -26,12 +26,6 @@
#define wxOSX_USE_NATIVE_FLIPPED 1
#endif
/*
* text rendering system
*/
#define wxOSX_USE_ATSU_TEXT 0
/*
* Audio System
*/

View File

@@ -145,15 +145,6 @@ public:
CTFontRef OSXGetCTFont() const;
#if wxOSX_USE_ATSU_TEXT
// Returns an ATSUStyle not ATSUStyle*
void* MacGetATSUStyle() const ;
void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
#endif
#if wxOSX_USE_COCOA
WX_NSFont OSXGetNSFont() const;
static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);

View File

@@ -19,7 +19,6 @@
* under a certain platform
*/
#define wxOSX_USE_ATSU_TEXT 0
#define wxHAS_OPENGL_ES
#define wxOSX_USE_QUICKTIME 0