Removed y_tab.c dependency

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index e134003482a5b61f689b823db36d2135eeedd0a2..5ffa4f828b8f3f68b60d63cbe33fe207fee51c67 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -67,7 +67,7 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
 
 void wxFontRefData::MacFindFont()
 {

-    if( m_faceName == "" )
+    if( m_faceName.Length() == 0 )

     {
         switch( m_family )
         {
     {
         switch( m_family )
         {


@@ -92,14 +92,13 @@ void wxFontRefData::MacFindFont()
         }
         Str255 name ;
         GetFontName( m_macFontNum , name ) ;
         }
         Str255 name ;
         GetFontName( m_macFontNum , name ) ;

-        CopyPascalStringToC( name , (char*) name ) ;
-        m_faceName = (char*) name ;
+        m_faceName = wxMacMakeStringFromPascal( name ) ;

     }
     else
     {
     }
     else
     {

-        if ( m_faceName == "systemfont" )
+        if ( m_faceName == wxT("systemfont") )

             m_macFontNum = ::GetSysFont() ;
             m_macFontNum = ::GetSysFont() ;

-        else if ( m_faceName == "applicationfont" )
+        else if ( m_faceName == wxT("applicationfont") )

             m_macFontNum = ::GetAppFont() ;
         else
         {
             m_macFontNum = ::GetAppFont() ;
         else
         {


@@ -126,7 +125,7 @@ void wxFontRefData::MacFindFont()
     status = ATSUFindFontFromName ( (Ptr) m_faceName , strlen( m_faceName ) ,
         kFontFullName,    kFontMacintoshPlatform, kFontRomanScript , kFontNoLanguage  ,  (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 , wxT("couldn't retrieve font identifier") ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------