X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8898456df4728afe7d100011e0e23b0ffb9a6341..0cdd04ad993f86710bc5c9d9c8c12ec25a34ac71:/src/cocoa/font.cpp diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp index c8aa187d02..ed1fac7b70 100644 --- a/src/cocoa/font.cpp +++ b/src/cocoa/font.cpp @@ -11,12 +11,13 @@ #include "wx/wxprec.h" +#include "wx/font.h" + #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/gdicmn.h" #endif -#include "wx/font.h" -#include "wx/gdicmn.h" #include "wx/encinfo.h" IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) @@ -36,6 +37,8 @@ wxFontRefData::~wxFontRefData() // TODO: delete font data } +#define M_FONTDATA ((wxFontRefData*)m_refData) + bool wxFont::Create(const wxNativeFontInfo&) { return false; @@ -160,13 +163,15 @@ void wxFont::SetWeight(int weight) RealizeResource(); } -void wxFont::SetFaceName(const wxString& faceName) +bool wxFont::SetFaceName(const wxString& faceName) { Unshare(); M_FONTDATA->m_faceName = faceName; RealizeResource(); + + return wxFontBase::SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined)