From 4b8f2c2b5f3821297559be32a5f1cfd96d945bfc Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 15 Nov 2004 20:25:18 +0000 Subject: [PATCH] changed fonts on OSX to use OSX system fonts having the full Unicode Tables git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/font.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 4ec3390c54..cb3742316f 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -207,20 +207,28 @@ void wxFontRefData::MacFindFont() case wxDEFAULT : m_macFontNum = ::GetAppFont() ; break ; - case wxDECORATIVE : - ::GetFNum( "\pTimes" , &m_macFontNum) ; - break ; - case wxROMAN : - ::GetFNum( "\pTimes" , &m_macFontNum) ; - break ; case wxSCRIPT : + case wxROMAN : + case wxDECORATIVE : +#ifdef __WXMAC_OSX__ + ::GetFNum( "\pTimes New Roman" , &m_macFontNum) ; +#else ::GetFNum( "\pTimes" , &m_macFontNum) ; +#endif break ; case wxSWISS : +#ifdef __WXMAC_OSX__ + ::GetFNum( "\pLucida Grande" , &m_macFontNum) ; +#else ::GetFNum( "\pGeneva" , &m_macFontNum) ; +#endif break ; case wxMODERN : +#ifdef __WXMAC_OSX__ ::GetFNum( "\pMonaco" , &m_macFontNum) ; +#else + ::GetFNum( "\pMonaco" , &m_macFontNum) ; +#endif break ; } Str255 name ;