From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 13 Jan 2009 04:54:21 +0000 (+0000)
Subject: make sure that code is always available when compiling for 10.4, whatever flavour
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4abb374e4db9d45ef3598834fd796786da0ec35e?ds=inline

make sure that code is always available when compiling for 10.4, whatever flavour

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index e2ef869e59..d1c72dac07 100644
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -754,7 +754,7 @@ bool wxFont::MacCreateFromCTFontDescriptor( const void * ctFontDescriptor , int
 
 #endif
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT
 bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
 {
 #if wxOSX_USE_CORE_TEXT
@@ -763,7 +763,6 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
         return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif
-#if wxOSX_USE_ATSU_TEXT
     {
         UnRef();
 
@@ -775,7 +774,6 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
         RealizeResource();
         return true;
     }
-#endif
     return false;
 }
 #endif