X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24aff654fb10971e82abccc1b56217d556d447b..65a1f3509bd761f4e6a4873f80889ebf84bc1e4b:/src/cocoa/font.cpp diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp index c907342aa5..7133060f8f 100644 --- a/src/cocoa/font.cpp +++ b/src/cocoa/font.cpp @@ -17,6 +17,7 @@ #include "wx/string.h" #include "wx/font.h" #include "wx/gdicmn.h" +#include "wx/encinfo.h" #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) @@ -80,6 +81,11 @@ int wxFont::GetWeight() const return 0; } +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const +{ + return NULL; +} + void wxGetNativeFontEncoding(wxFontEncoding, wxNativeEncodingInfo*); bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) @@ -183,7 +189,7 @@ void wxFont::SetUnderlined(bool underlined) /* New font system */ wxString wxFont::GetFaceName() const { - wxString str(""); + wxString str; if (M_FONTDATA) str = M_FONTDATA->m_faceName ; return str;