]> git.saurik.com Git - wxWidgets.git/commitdiff
changed fonts on OSX to use OSX system fonts having the full Unicode Tables
authorStefan Csomor <csomor@advancedconcepts.ch>
Mon, 15 Nov 2004 20:25:18 +0000 (20:25 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Mon, 15 Nov 2004 20:25:18 +0000 (20:25 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/font.cpp

index 4ec3390c547e148194a5489c304f69ef386cff0b..cb3742316f1952910eeab343f6fdfaa743acaf26 100644 (file)
@@ -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 ;