appearance fonts

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index d30015eaf9e533df8061bf055a112e549ad5d9b6..eec71c52eedae360d9e3ac3e1e6b585aa8b2ba28 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -121,6 +121,10 @@ void wxFontRefData::MacFindFont()
        //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); 
        //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" ) ;
 }
 
        wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;
 }
 

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index d30015eaf9e533df8061bf055a112e549ad5d9b6..eec71c52eedae360d9e3ac3e1e6b585aa8b2ba28 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -121,6 +121,10 @@ void wxFontRefData::MacFindFont()
        //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); 
        //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" ) ;
 }
 
        wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;
 }