X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f305456585c3f53b58f90803d25f1392eaedb36..259c43f679ca655362b5a439e11c87fc0666d663:/include/wx/mac/carbon/font.h diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index 5968f65705..c28ed650b7 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -12,10 +12,6 @@ #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "font.h" -#endif - // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- @@ -96,15 +92,24 @@ public: // Unofficial API, don't use virtual void SetNoAntiAliasing( bool noAA = TRUE ) ; - virtual bool GetNoAntiAliasing() ; + virtual bool GetNoAntiAliasing() const ; // Mac-specific, risks to change, don't use in portable code + + // '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 ; + protected: // common part of all ctors void Init();