fixed wide char codeset detection for systems which do support LE/BE variants (broken...

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

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