implement flag for Unix-like behaviour in wxCmdLineParser::ConverStringToArgs()

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index d069f3c89e996e7e28394dd4c862c609d6a823b3..53a3061271484fb6a8471ef6930f0fd6031827a3 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -25,7 +25,7 @@
 #include "wx/graphics.h"
 #include "wx/settings.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #ifndef __DARWIN__
 #include <ATSUnicode.h>
@@ -316,7 +316,7 @@ static CTFontDescriptorRef wxMacCreateCTFontDescriptor(CFStringRef iFamilyName,
 wxFontRefData::wxFontRefData( wxUint32 coreTextFontType )
 {
     CTFontRef font = CTFontCreateUIFontForLanguage( coreTextFontType, 0.0, NULL ) ;
-    if ( CTFontGetSize(m_ctFont) == 0 )
+    if ( CTFontGetSize(font) == 0 )
     {
         CFRelease(font);
         font = CTFontCreateUIFontForLanguage( coreTextFontType, 12.0, NULL );
@@ -391,12 +391,12 @@ void wxFontRefData::MacFindFont()
                         break ;
 
                     case wxSWISS :
-                        m_faceName =  wxT("Lucida Grande");
+                        m_faceName =  wxT("Helvetica");
                         break ;
 
                     case wxMODERN :
                     case wxTELETYPE:
-                        m_faceName =  wxT("Monaco");
+                        m_faceName =  wxT("Courier");
                         break ;
 
                     default:
@@ -446,7 +446,7 @@ void wxFontRefData::MacFindFont()
             m_ctFont.reset( CTFontCreateWithFontDescriptor( m_ctFontDescriptor, m_pointSize, NULL ) );
 #endif
         }
-#if wxMAC_USE_ATSU_TEXT == 0
+#if wxMAC_USE_ATSU_TEXT
         OSStatus status = noErr;
         CTFontDescriptorRef desc = m_ctFontDescriptor ;
         ATSFontRef atsfont = CTFontGetPlatformFont( m_ctFont, &desc );
@@ -542,12 +542,12 @@ void wxFontRefData::MacFindFont()
                             break ;
 
                         case wxSWISS :
-                            m_faceName =  wxT("Lucida Grande");
+                            m_faceName =  wxT("Helvetica");
                             break ;
 
                         case wxMODERN :
                         case wxTELETYPE:
-                            m_faceName =  wxT("Monaco");
+                            m_faceName =  wxT("Courier");
                             break ;
 
                         default: