Add support for the Windows Testdrive machines, and other improvments.

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index b799c00d2d2f58a68bab390792db7a4d93937480..4df05442ea462b44322213d7b742081081c894de 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -361,10 +361,10 @@ void wxFontRefData::MacFindFont()
         {
             m_ctFont.reset(CTFontCreateUIFontForLanguage( kCTFontSystemFontType, 0.0, NULL ));
         }
         {
             m_ctFont.reset(CTFontCreateUIFontForLanguage( kCTFontSystemFontType, 0.0, NULL ));
         }

-        
-        if ( m_ctFont.get() )
+           
+        if ( m_ctFont )

         {            
         {            

-            wxMacCFStringHolder name( CTFontCopyFamilyName( m_ctFont ) );
+            wxCFStringRef name( CTFontCopyFamilyName( m_ctFont ) );

             m_faceName = name.AsString();
             m_pointSize = CTFontGetSize(m_ctFont) ;
             CTFontSymbolicTraits traits = CTFontGetSymbolicTraits( m_ctFont );
             m_faceName = name.AsString();
             m_pointSize = CTFontGetSize(m_ctFont) ;
             CTFontSymbolicTraits traits = CTFontGetSymbolicTraits( m_ctFont );


@@ -402,7 +402,7 @@ void wxFontRefData::MacFindFont()
                 }
             }
 
                 }
             }
 

-            wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
+            wxCFStringRef cf( m_faceName, wxLocale::GetSystemEncoding() );

             CTFontSymbolicTraits traits = 0;
         
             if (m_weight == wxBOLD)
             CTFontSymbolicTraits traits = 0;
         
             if (m_weight == wxBOLD)


@@ -539,7 +539,7 @@ void wxFontRefData::MacFindFont()
                     m_macFontFamily = GetAppFont();
                 else
                 {
                     m_macFontFamily = GetAppFont();
                 else
                 {

-                    wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
+                    wxCFStringRef cf( m_faceName, wxLocale::GetSystemEncoding() );

                     ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
                     if ( atsfamily == (ATSFontFamilyRef) -1 )
                     {
                     ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
                     if ( atsfamily == (ATSFontFamilyRef) -1 )
                     {