recognize schemes other than http and ftp in wxLaunchDefaultBrowser()

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index e2ef869e59e68007deec98a49548236bff885ee4..3d295d4bb901df0cd264ce2f6c82d0d22ec2f416 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -424,7 +424,7 @@ void wxFontRefData::MacFindFont()
                 // QD selection algorithm is the fastest by orders of magnitude on 10.5
                 if ( m_faceName.IsAscii() )
                 {
-                    uint8 qdstyle = 0;
+                    uint8_t qdstyle = 0;
                     if (m_weight == wxFONTWEIGHT_BOLD)
                         qdstyle |= bold;
                     if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
@@ -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