From 4a473abaf2f6171a649fac9ede9a5f11cb7ddbeb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 30 Sep 2010 17:30:48 +0000 Subject: [PATCH] opening ATSU Font info for Ulrich Telle's wxPDFContext git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/font.h | 2 -- src/osx/carbon/font.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index 829d9a4b59..b05661b4b1 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -146,11 +146,9 @@ public: void* MacGetATSUStyle() const ; void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; } -#if WXWIN_COMPATIBILITY_2_8 wxDEPRECATED( wxUint32 MacGetATSUFontID() const ); wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const ); #endif -#endif #if wxOSX_USE_COCOA WX_NSFont OSXGetNSFont() const; diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 360a7fa9aa..573f8681d0 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -814,7 +814,6 @@ void * wxFont::MacGetATSUStyle() const return M_FONTDATA->m_macATSUStyle; } -#if WXWIN_COMPATIBILITY_2_8 wxUint32 wxFont::MacGetATSUFontID() const { wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") ); @@ -836,8 +835,6 @@ wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const } #endif -#endif - #if wxOSX_USE_CORE_TEXT CTFontRef wxFont::OSXGetCTFont() const -- 2.45.2