X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4ff8b3e4e8e906806bafbb1acfd7248b89c5994..c579ac6280f819e8e6fb2adf80d345d84b0bfcfe:/include/wx/osx/font.h diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index 158df31e4d..6f379089c0 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -60,7 +60,7 @@ public: { Create(size, family, style, weight, underlined, face, encoding); } - + wxFont(const wxSize& pixelSize, wxFontFamily family, wxFontStyle style, @@ -72,7 +72,7 @@ public: Create(10, family, style, weight, underlined, face, encoding); SetPixelSize(pixelSize); } - + bool Create(int size, wxFontFamily family, wxFontStyle style, @@ -91,7 +91,7 @@ public: bool Create(const wxNativeFontInfo& info); bool CreateSystemFont(wxOSXSystemFont font); - + virtual ~wxFont(); // implement base class pure virtuals @@ -113,7 +113,7 @@ public: virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - WXDECLARE_COMPAT_SETTERS + wxDECLARE_COMMON_FONT_METHODS(); // implementation only from now on // ------------------------------- @@ -166,6 +166,8 @@ public: #endif protected: + virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); + virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;