X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/carbon/font.h diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index 78aa2f4d5f..d7a69df50e 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 // ---------------------------------------------------------------------------- @@ -24,13 +20,7 @@ class WXDLLEXPORT wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) - : wxFontBase() - { - Init(); - Ref(font); - } + wxFont() { } wxFont(int size, int family, @@ -40,15 +30,11 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } wxFont(const wxNativeFontInfo& info) { - Init(); - (void)Create(info); } @@ -64,13 +50,13 @@ public: bool Create(const wxNativeFontInfo& info); + bool MacCreateThemeFont( wxUint16 themeFontID ) ; + virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // 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; @@ -83,7 +69,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); @@ -94,18 +80,25 @@ 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 - short GetMacFontNum() const; - short GetMacFontSize() const; - wxByte GetMacFontStyle() const; - wxUint32 GetMacATSUFontID() const; - + + // '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(); - void Unshare(); private: