X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..af27647706cb7ca50cf04814ff867532919a252c:/include/wx/osx/carbon/font.h

diff --git a/include/wx/osx/carbon/font.h b/include/wx/osx/carbon/font.h
index 3962e4b287..d2dcb558ae 100644
--- a/include/wx/osx/carbon/font.h
+++ b/include/wx/osx/carbon/font.h
@@ -50,8 +50,10 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
+#if wxOSX_USE_CARBON
     bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
-#if wxMAC_USE_CORE_TEXT
+#endif
+#if wxOSX_USE_CORE_TEXT
     bool MacCreateFromUIFont( wxUint32 coreTextFontType );
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
     bool MacCreateFromCTFont( const void * ctFont );
@@ -89,7 +91,7 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
 
-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
@@ -102,11 +104,10 @@ public:
 
     // Returns an ATSUStyle not ATSUStyle*
 #endif
-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT
     const void * MacGetCTFont() const;
-    const void * MacGetCTFontDescriptor() const;
 #endif
-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT
     void* MacGetATSUStyle() const ;
 #endif