use wxWindowBase::Create() instead of duplicating its code in MacPreControlCreate()

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index e134003482a5b61f689b823db36d2135eeedd0a2..d94805d819a4177cd87b635d7619c5b806cca2a4 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -67,7 +67,7 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
-    if( m_faceName == "" )
+    if( m_faceName.Length() == 0 )
     {
         switch( m_family )
         {
@@ -92,14 +92,13 @@ void wxFontRefData::MacFindFont()
         }
         Str255 name ;
         GetFontName( m_macFontNum , name ) ;
-        CopyPascalStringToC( name , (char*) name ) ;
-        m_faceName = (char*) name ;
+        m_faceName = wxMacMakeStringFromPascal( name ) ;
     }
     else
     {
-        if ( m_faceName == "systemfont" )
+        if ( m_faceName == wxT("systemfont") )
             m_macFontNum = ::GetSysFont() ;
-        else if ( m_faceName == "applicationfont" )
+        else if ( m_faceName == wxT("applicationfont") )
             m_macFontNum = ::GetAppFont() ;
         else
         {
@@ -121,12 +120,15 @@ void wxFontRefData::MacFindFont()
     //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); 
+#ifdef __WXDEBUG__
+    OSStatus status =
+#endif // __WXDEBUG__
+        ::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 , wxT("couldn't retrieve font identifier") ) ;
 }
 
 // ----------------------------------------------------------------------------