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 1b9416748d3da8a1976c281a7a836d8d086f182b..cb3742316f1952910eeab343f6fdfaa743acaf26 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -95,7 +95,7 @@ public:
 
     virtual ~wxFontRefData();
     void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
 
     virtual ~wxFontRefData();
     void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }

-    bool GetNoAntiAliasing() { return m_noAA; }
+    bool GetNoAntiAliasing() const { return m_noAA; }

     
 protected:
     // common part of all ctors
     
 protected:
     // common part of all ctors


@@ -207,20 +207,28 @@ void wxFontRefData::MacFindFont()
                 case wxDEFAULT :
                     m_macFontNum = ::GetAppFont() ;
                     break ;
                 case wxDEFAULT :
                     m_macFontNum = ::GetAppFont() ;
                     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 ;
                 case wxSWISS :
                     break ;
                 case wxSWISS :

+#ifdef __WXMAC_OSX__
+                    ::GetFNum( "\pLucida Grande" , &m_macFontNum) ;
+#else

                     ::GetFNum( "\pGeneva" , &m_macFontNum) ;
                     ::GetFNum( "\pGeneva" , &m_macFontNum) ;

+#endif

                     break ;
                 case wxMODERN :
                     break ;
                 case wxMODERN :

+#ifdef __WXMAC_OSX__
+                    ::GetFNum( "\pMonaco" , &m_macFontNum) ;
+#else

                     ::GetFNum( "\pMonaco" , &m_macFontNum) ;
                     ::GetFNum( "\pMonaco" , &m_macFontNum) ;

+#endif

                     break ;
             }
             Str255 name ;
                     break ;
             }
             Str255 name ;


@@ -477,7 +485,7 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

-bool wxFont::GetNoAntiAliasing()
+bool wxFont::GetNoAntiAliasing() const

 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
     return M_FONTDATA->m_noAA;
 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
     return M_FONTDATA->m_noAA;