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

adding back API for 2.8 compatibility

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-24 06:58:43 +00:00
parent 66f22f4ae5
commit 6f283573af
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,10 @@ public:
#if wxOSX_USE_ATSU_TEXT #if wxOSX_USE_ATSU_TEXT
// Returns an ATSUStyle not ATSUStyle* // Returns an ATSUStyle not ATSUStyle*
void* MacGetATSUStyle() const ; void* MacGetATSUStyle() const ;
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
#endif
#endif #endif
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA

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

@@ -772,6 +772,29 @@ void * wxFont::MacGetATSUStyle() const
return M_FONTDATA->m_macATSUStyle; return M_FONTDATA->m_macATSUStyle;
} }
#if WXWIN_COMPATIBILITY_2_8
wxUint32 wxFont::MacGetATSUFontID() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
// cast away constness otherwise lazy font resolution is not possible
const_cast<wxFont *>(this)->RealizeResource();
return M_FONTDATA->m_info.m_atsuFontID;
}
wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
// cast away constness otherwise lazy font resolution is not possible
const_cast<wxFont *>(this)->RealizeResource();
return M_FONTDATA->m_info.m_atsuAdditionalQDStyles;
}
#endif
#endif #endif
#if wxOSX_USE_CORE_TEXT #if wxOSX_USE_CORE_TEXT