define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp...

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index a03c46302705bec0b6ec8befc2bcd779f88f697a..d1c72dac0714815c868eacbfb2e42536a5f12378 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -394,9 +394,9 @@ void wxFontRefData::MacFindFont()
                     case wxFONTFAMILY_MODERN :
                     case wxFONTFAMILY_TELETYPE:
                         m_faceName =  wxT("Courier");
-                        if ( m_style == wxFONTFAMILY_ITALIC && m_weight == wxFONTFAMILY_NORMAL )
+                        if ( m_style == wxFONTSTYLE_ITALIC && m_weight == wxFONTWEIGHT_NORMAL )
                         {
-                            m_style = wxFONTFAMILY_ITALIC;
+                            m_style = wxFONTSTYLE_ITALIC;
                         }
                         break ;
 
@@ -754,7 +754,7 @@ bool wxFont::MacCreateFromCTFontDescriptor( const void * ctFontDescriptor , int
 
 #endif
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT
 bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
 {
 #if wxOSX_USE_CORE_TEXT
@@ -763,7 +763,6 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
         return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif
-#if wxOSX_USE_ATSU_TEXT
     {
         UnRef();
 
@@ -775,7 +774,6 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
         RealizeResource();
         return true;
     }
-#endif
     return false;
 }
 #endif