X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/mac/font.cpp?ds=sidebyside

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index d425b3cf95..ab906cad67 100644
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -22,6 +22,9 @@
 
 #include "wx/fontutil.h"
 
+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
@@ -113,6 +116,12 @@ void wxFontRefData::MacFindFont()
 	if (m_underlined) 
 		m_macFontStyle |= underline;
 	m_macFontSize = m_pointSize ;
+	
+	//TODO:if we supply the style as an additional parameter we must make a testing
+	//sequence in order to degrade gracefully while trying to maintain most of the style
+	//information, meanwhile we just take the normal font and apply the features after
+	OSStatus status = ::ATSUFONDtoFontID(m_macFontNum, normal /*qdStyle*/, (UInt32*)&m_macATSUFontID); 
+	wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -121,8 +130,6 @@ void wxFontRefData::MacFindFont()
 
 void wxFont::Init()
 {
-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
 }
 
 bool wxFont::Create(const wxNativeFontInfo& info)
@@ -157,8 +164,6 @@ bool wxFont::Create(int pointSize,
 
 wxFont::~wxFont()
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
 }
 
 bool wxFont::RealizeResource()