adding back API for 2.8 compatibility

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 0d449c9c2d37d2d05fda41b4b6d05ce702b32b39..f3410c1fbbbfc19536dd799af14fb296a4d593aa 100644 (file)
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -144,6 +144,10 @@ public:
 #if wxOSX_USE_ATSU_TEXT
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ;
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
+    wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
+#endif
 #endif
 
 #if wxOSX_USE_COCOA

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 250fecd35a1325b2b29472476c3c6ee18d16ae09..d4925a90a3dbf821ad8ab72147f6231a9a0e2a26 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -772,6 +772,29 @@ void * wxFont::MacGetATSUStyle() const
     
     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
 
 #if wxOSX_USE_CORE_TEXT