merge with latest sources

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/font.cpp

@@ -18,7 +18,9 @@
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 
+#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#endif
 
 
 
@@ -77,7 +79,7 @@ void wxFontRefData::MacFindFont()
 				::GetFNum( "\pTimes" , &m_macFontNum) ;
 				break ;
 			case wxSWISS :
-				::GetFNum( "\pHelvetica" , &m_macFontNum) ;
+				::GetFNum( "\pGeneva" , &m_macFontNum) ;
 				break ;
 			case wxMODERN :
 				::GetFNum( "\pMonaco" , &m_macFontNum) ;