X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80fdcdb90ef779185492dab676d461fc34933312..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/cocoa/font.mm?ds=inline diff --git a/src/cocoa/font.mm b/src/cocoa/font.mm index c7297d8aa3..abb9ddd09e 100644 --- a/src/cocoa/font.mm +++ b/src/cocoa/font.mm @@ -64,7 +64,7 @@ and a particular set of attributes. Furthermore, the attributes instead of being flags as in NSFontManager are instead well-defined keys in a dictionary. - The only way to get that behavior without NSFontManager is to pare down the + The only way to get that behaviour without NSFontManager is to pare down the list as much as possible using the classic NSFontManager methods and then to instantiate each font in the list and match on each font's afmDictionary. @@ -102,7 +102,7 @@ static wxNativeFontInfo MakeNativeFontInfo(int size, wxFontFamily family, wxFont wxNativeFontInfo so anyone who subclassed it or created one without going through wxFont should expect what they get (i.e. horrible breakage) There's a concern that wxFontRefData was in the public header when 2.8 shipped so - it's possible that someone did subclass it to get better font behavior. + it's possible that someone did subclass it to get better font behaviour. For right now, the plan is to write it strictly ABI compatible with 2.8 and eventually to enhance it in trunk to accurately represent font attributes as Cocoa sees them. @@ -350,7 +350,7 @@ wxFontEncoding wxFont::GetEncoding() const int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_info.pointSize; } @@ -364,7 +364,7 @@ bool wxFont::GetUnderlined() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_info.style; } @@ -375,13 +375,13 @@ wxFontFamily wxFont::DoGetFamily() const wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_info.weight; } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return &M_FONTDATA->m_info; }