Removed all duplicated and complicated #ifdefs for enabling Skip and Abort in progres...

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 4ec3390c547e148194a5489c304f69ef386cff0b..cb3742316f1952910eeab343f6fdfaa743acaf26 100644 (file)
--- 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 ;