X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24aff654fb10971e82abccc1b56217d556d447b..d21423356ee013f6819f7b8b69cd2e662e15d44a:/src/cocoa/font.cpp

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index c907342aa5..dd538c4d8e 100644
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -9,18 +9,13 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "font.h"
-#endif
-
 #include "wx/defs.h"
 #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)
-#endif
 
 void wxFontRefData::Init(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {
@@ -80,6 +75,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 +183,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;