ignore hidden windows when deciding if the MDI parent frame should be visible

[wxWidgets.git] / src / cocoa / font.cpp

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index c907342aa524924cbad3934bf1ac4ef50f160c27..dbfd16189954bbdd2bcc58594b957748552d28e7 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -17,10 +17,9 @@
 #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 +79,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 +187,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;