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
This commit is contained in:
parent
b07760f1b6
commit
4b8f2c2b5f
@ -207,20 +207,28 @@ void wxFontRefData::MacFindFont()
|
|||||||
case wxDEFAULT :
|
case wxDEFAULT :
|
||||||
m_macFontNum = ::GetAppFont() ;
|
m_macFontNum = ::GetAppFont() ;
|
||||||
break ;
|
break ;
|
||||||
case wxDECORATIVE :
|
|
||||||
::GetFNum( "\pTimes" , &m_macFontNum) ;
|
|
||||||
break ;
|
|
||||||
case wxROMAN :
|
|
||||||
::GetFNum( "\pTimes" , &m_macFontNum) ;
|
|
||||||
break ;
|
|
||||||
case wxSCRIPT :
|
case wxSCRIPT :
|
||||||
|
case wxROMAN :
|
||||||
|
case wxDECORATIVE :
|
||||||
|
#ifdef __WXMAC_OSX__
|
||||||
|
::GetFNum( "\pTimes New Roman" , &m_macFontNum) ;
|
||||||
|
#else
|
||||||
::GetFNum( "\pTimes" , &m_macFontNum) ;
|
::GetFNum( "\pTimes" , &m_macFontNum) ;
|
||||||
|
#endif
|
||||||
break ;
|
break ;
|
||||||
case wxSWISS :
|
case wxSWISS :
|
||||||
|
#ifdef __WXMAC_OSX__
|
||||||
|
::GetFNum( "\pLucida Grande" , &m_macFontNum) ;
|
||||||
|
#else
|
||||||
::GetFNum( "\pGeneva" , &m_macFontNum) ;
|
::GetFNum( "\pGeneva" , &m_macFontNum) ;
|
||||||
|
#endif
|
||||||
break ;
|
break ;
|
||||||
case wxMODERN :
|
case wxMODERN :
|
||||||
|
#ifdef __WXMAC_OSX__
|
||||||
::GetFNum( "\pMonaco" , &m_macFontNum) ;
|
::GetFNum( "\pMonaco" , &m_macFontNum) ;
|
||||||
|
#else
|
||||||
|
::GetFNum( "\pMonaco" , &m_macFontNum) ;
|
||||||
|
#endif
|
||||||
break ;
|
break ;
|
||||||
}
|
}
|
||||||
Str255 name ;
|
Str255 name ;
|
||||||
|
Loading…
Reference in New Issue
Block a user