Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opening ATSU Font info for Ulrich Telle's wxPDFContext

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-09-30 17:30:48 +00:00
parent 51b729af92
commit 4a473abaf2
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/font.h
View File

@@ -146,11 +146,9 @@ public:
void* MacGetATSUStyle() const ; void* MacGetATSUStyle() const ;
void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; } void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( wxUint32 MacGetATSUFontID() const ); wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const ); wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
#endif #endif
#endif
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
WX_NSFont OSXGetNSFont() const; WX_NSFont OSXGetNSFont() const;

3
src/osx/carbon/font.cpp
View File

@@ -814,7 +814,6 @@ void * wxFont::MacGetATSUStyle() const
return M_FONTDATA->m_macATSUStyle; return M_FONTDATA->m_macATSUStyle;
} }
#if WXWIN_COMPATIBILITY_2_8
wxUint32 wxFont::MacGetATSUFontID() const wxUint32 wxFont::MacGetATSUFontID() const
{ {
wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") ); wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );
@@ -836,8 +835,6 @@ wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
} }
#endif #endif
#endif
#if wxOSX_USE_CORE_TEXT #if wxOSX_USE_CORE_TEXT
CTFontRef wxFont::OSXGetCTFont() const CTFontRef wxFont::OSXGetCTFont() const