X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da52a4e023e73c2922f63d95026816a624695559..396197cb567090122f9f2e640d2910c2491a7c47:/include/wx/mac/carbon/font.h diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index b9e87b571e..6266ea102c 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -52,11 +52,11 @@ public: bool MacCreateFromThemeFont( wxUint16 themeFontID ) ; #if wxMAC_USE_CORE_TEXT - bool MacCreateFromUIFont( wxUint32 coreTextFontType ); + 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 @@ -88,31 +88,36 @@ public: virtual bool GetNoAntiAliasing() const ; // 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* - void* MacGetATSUStyle() const ; #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: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: void Unshare(); DECLARE_DYNAMIC_CLASS(wxFont) }; -#endif - // _WX_FONT_H_ +#endif // _WX_FONT_H_