diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index 891e32b6ee..b9e87b571e 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -50,9 +50,11 @@ public: bool Create(const wxNativeFontInfo& info); - bool MacCreateThemeFont( wxUint16 themeFontID ) ; + bool MacCreateFromThemeFont( wxUint16 themeFontID ) ; #if wxMAC_USE_CORE_TEXT - bool MacCreateUIFont( wxUint32 coreTextFontType ); + bool MacCreateFromUIFont( wxUint32 coreTextFontType ); + bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 ); + bool MacCreateFromCTFont( const void * ctFont ); #endif virtual ~wxFont(); @@ -103,6 +105,7 @@ public: #endif #if wxMAC_USE_CORE_TEXT const void * MacGetCTFont() const; + const void * MacGetCTFontDescriptor() const; #endif private: