X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/font.h diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index f513354e35..9863e0325d 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -50,12 +50,18 @@ public: bool Create(const wxNativeFontInfo& info); - bool MacCreateThemeFont( wxUint16 themeFontID ) ; + bool MacCreateFromThemeFont( wxUint16 themeFontID ) ; +#if wxMAC_USE_CORE_TEXT + bool MacCreateFromUIFont( wxUint32 coreTextFontType ); + bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 ); + bool MacCreateFromCTFont( const void * ctFont ); +#endif virtual ~wxFont(); // implement base class pure virtuals virtual int GetPointSize() const; + virtual wxSize GetPixelSize() const; virtual int GetFamily() const; virtual int GetStyle() const; virtual int GetWeight() const; @@ -68,7 +74,7 @@ public: virtual void SetFamily(int family); virtual void SetStyle(int style); virtual void SetWeight(int weight); - virtual void SetFaceName(const wxString& faceName); + virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); @@ -83,24 +89,30 @@ public: // Mac-specific, risks to change, don't use in portable code +#if wxMAC_USE_ATSU_TEXT // 'old' Quickdraw accessors - short MacGetFontNum() const; short MacGetFontSize() const; wxByte MacGetFontStyle() const; // 'new' ATSUI accessors - wxUint32 MacGetATSUFontID() const; wxUint32 MacGetATSUAdditionalQDStyles() const; wxUint16 MacGetThemeFontID() const ; + // Returns an ATSUStyle not ATSUStyle* +#endif +#if wxMAC_USE_CORE_TEXT + const void * MacGetCTFont() const; + const void * MacGetCTFontDescriptor() const; +#endif +#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT void* MacGetATSUStyle() const ; +#endif -protected: +private: void Unshare(); -private: DECLARE_DYNAMIC_CLASS(wxFont) };