X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ac2e80ca299919ce51415cc79f6a7a4951970c5..81853b98619293be66074d74d2557973c0f3ab21:/include/wx/mac/carbon/font.h?ds=sidebyside diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index 5221529194..f513354e35 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); } @@ -68,9 +54,6 @@ public: virtual ~wxFont(); - // assignment - wxFont& operator=(const wxFont& font); - // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -99,16 +82,22 @@ public: 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(); - void Unshare(); private: