fixing 10.5 only compiles

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index db727b6515ec4c5de4efc4bd0ddaeb5fa83a9617..241ae9a01933ae28910f9e0a004b9eac3d6fab04 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -24,7 +24,7 @@
 #include "wx/fontutil.h"
 #include "wx/graphics.h"
 
-#include "wx/mac/private.h"
+#include "wx/mac/uma.h"
 
 #ifndef __DARWIN__
 #include <ATSUnicode.h>
@@ -147,7 +147,7 @@ void wxFontRefData::Init(int pointSize,
     m_faceName = faceName;
     m_encoding = encoding;
     m_noAA = false;
-#ifdef wxMAC_USE_CORE_TEXT
+#if wxMAC_USE_CORE_TEXT
     m_macUIFontType = kCTFontNoFontType;
 #endif
 #if wxMAC_USE_ATSU_TEXT
@@ -163,11 +163,13 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
+#if wxMAC_USE_ATSU_TEXT
     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
         m_macATSUStyle = NULL ;
     }
+#endif
 }
 
 #if wxMAC_USE_CORE_TEXT
@@ -232,10 +234,9 @@ static CTFontRef wxMacCreateCTFont(CFStringRef iFamilyName, CTFontSymbolicTraits
 
 void wxFontRefData::MacFindFont()
 {
-    OSStatus status = noErr;
 
 #if wxMAC_USE_CORE_TEXT
-    if (  CTFontCreateWithName != NULL )
+    if (  UMAGetSystemVersion() >= 0x1050 )
     {
         if ( m_faceName.empty() && m_family == wxDEFAULT && m_macUIFontType == kCTFontNoFontType )
         {
@@ -298,6 +299,7 @@ void wxFontRefData::MacFindFont()
 #endif
 #if wxMAC_USE_ATSU_TEXT
     {
+        OSStatus status = noErr;
         Str255 qdFontName ;
         if ( m_macThemeFontID != kThemeCurrentPortFont )
         {
@@ -517,12 +519,12 @@ bool wxFont::MacCreateUIFont(wxUint32 ctFontType )
 bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
 {
 #if wxMAC_USE_CORE_TEXT
-    if ( HIThemeGetUIFontType != NULL )
+    if ( UMAGetSystemVersion() >= 0x1050)
     {
         return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif
-#if wxMAC_USE_CORE_TEXT
+#if wxMAC_USE_ATSU_TEXT
     {
         UnRef();
 
@@ -532,9 +534,10 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
 
         M_FONTDATA->m_macThemeFontID = themeFontID ;
         RealizeResource();
+        return true;
     }
-    return true;
 #endif
+    return false;
 }
 
 wxFont::~wxFont()