crush compiler warnings and handle out of memory errors slightly better

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

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 485e44765314b4fdefea832c8923629d7b8b22b5..7133060f8f513ddc2d8a6d7a51a3c7f91ae18a28 100644 (file)
--- 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)
@@ -188,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;