fixing 10.5 only compiles

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 43fb830b87f40e73ba4b9412eabae47402abac4d..241ae9a01933ae28910f9e0a004b9eac3d6fab04 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -163,11 +163,13 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {

+#if wxMAC_USE_ATSU_TEXT

     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
         m_macATSUStyle = NULL ;
     }
     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
         m_macATSUStyle = NULL ;
     }

+#endif

 }
 
 #if wxMAC_USE_CORE_TEXT
 }
 
 #if wxMAC_USE_CORE_TEXT


@@ -232,7 +234,6 @@ static CTFontRef wxMacCreateCTFont(CFStringRef iFamilyName, CTFontSymbolicTraits
 
 void wxFontRefData::MacFindFont()
 {
 
 void wxFontRefData::MacFindFont()
 {

-    OSStatus status = noErr;

 
 #if wxMAC_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
 
 #if wxMAC_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )


@@ -298,6 +299,7 @@ void wxFontRefData::MacFindFont()
 #endif
 #if wxMAC_USE_ATSU_TEXT
     {
 #endif
 #if wxMAC_USE_ATSU_TEXT
     {

+        OSStatus status = noErr;

         Str255 qdFontName ;
         if ( m_macThemeFontID != kThemeCurrentPortFont )
         {
         Str255 qdFontName ;
         if ( m_macThemeFontID != kThemeCurrentPortFont )
         {


@@ -522,7 +524,7 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
         return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif
         return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif

-#if wxMAC_USE_CORE_TEXT
+#if wxMAC_USE_ATSU_TEXT

     {
         UnRef();
 
     {
         UnRef();
 


@@ -532,9 +534,10 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
 
         M_FONTDATA->m_macThemeFontID = themeFontID ;
         RealizeResource();
 
         M_FONTDATA->m_macThemeFontID = themeFontID ;
         RealizeResource();

+        return true;

     }
     }

-    return true;

 #endif
 #endif

+    return false;

 }
 
 wxFont::~wxFont()
 }
 
 wxFont::~wxFont()