X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..4855a4773e9a49c6bb70f1adc3da7109e0b6ccf7:/src/mac/font.cpp?ds=sidebyside

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 2335e5d262..eec71c52ee 100644
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -23,7 +23,7 @@
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"
-
+#include "ATSUnicode.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
@@ -54,9 +54,9 @@ void wxFontRefData::Init(int pointSize,
     m_faceName = faceName;
     m_encoding = encoding;
 
-	m_macFontNum = 0 ;
-	m_macFontSize = 0;
-	m_macFontStyle = 0;
+    m_macFontNum = 0 ;
+    m_macFontSize = 0;
+    m_macFontStyle = 0;
     m_fontId = 0;
 }
 
@@ -116,6 +116,16 @@ 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); 
+    /*
+    status = ATSUFindFontFromName ( (Ptr) m_faceName , strlen( m_faceName ) ,
+        kFontFullName,	kFontMacintoshPlatform, kFontRomanScript , kFontNoLanguage  ,  (UInt32*)&m_macATSUFontID ) ;
+    */
+	wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;
 }
 
 // ----------------------------------------------------------------------------