tried to make Close() docs more clear

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index ab906cad670ebc795f1f203b7454e501793c052f..d1b4798cc40e0bf630f2eabf58f5409118611bc7 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -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;
 }
 
@@ -89,6 +89,10 @@ void wxFontRefData::MacFindFont()
                                ::GetFNum( "\pMonaco" , &m_macFontNum) ;
                                break ;
                }
+               Str255 name ;
+               GetFontName( m_macFontNum , name ) ;
+               CopyPascalStringToC( name , (char*) name ) ;
+               m_faceName = (char*) name ;
        }
        else
        {
@@ -121,6 +125,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); 
+    /*
+    status = ATSUFindFontFromName ( (Ptr) m_faceName , strlen( m_faceName ) ,
+        kFontFullName, kFontMacintoshPlatform, kFontRomanScript , kFontNoLanguage  ,  (UInt32*)&m_macATSUFontID ) ;
+    */
        wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;
 }