X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/fontmgrcmn.cpp diff --git a/src/common/fontmgrcmn.cpp b/src/common/fontmgrcmn.cpp index f942d736e8..b4a379ddae 100644 --- a/src/common/fontmgrcmn.cpp +++ b/src/common/fontmgrcmn.cpp @@ -123,8 +123,8 @@ wxFontBundleBase::GetFaceForFont(const wxFontMgrFontRefData& font) const type |= FaceType_Bold; // FIXME -- this should read "if ( font->GetStyle() == wxITALIC )", - // but since MGL neither DFB supports slant, we try to display it with - // italic face (better than nothing...) + // but since DFB doesn't support slant, we try to display it with italic + // face (better than nothing...) if ( font.GetStyle() == wxITALIC || font.GetStyle() == wxSLANT ) { if ( HasFace((FaceType)(type | FaceType_Italic)) ) @@ -245,8 +245,6 @@ wxFontMgrFontRefData::wxFontMgrFontRefData(int size, m_info.underlined = underlined; m_info.encoding = encoding; - m_noAA = false; - m_fontFace = NULL; m_fontBundle = NULL; m_fontValid = false; @@ -255,7 +253,6 @@ wxFontMgrFontRefData::wxFontMgrFontRefData(int size, wxFontMgrFontRefData::wxFontMgrFontRefData(const wxFontMgrFontRefData& data) { m_info = data.m_info; - m_noAA = data.m_noAA; m_fontFace = data.m_fontFace; m_fontBundle = data.m_fontBundle; @@ -281,7 +278,7 @@ wxFontMgrFontRefData::GetFontInstance(float scale, bool antialiased) const { wxConstCast(this, wxFontMgrFontRefData)->EnsureValidFont(); return m_fontFace->GetFontInstance(m_info.pointSize * scale, - antialiased && !m_noAA); + antialiased); } void wxFontMgrFontRefData::SetPointSize(int pointSize) @@ -326,12 +323,6 @@ void wxFontMgrFontRefData::SetEncoding(wxFontEncoding encoding) m_fontValid = false; } -void wxFontMgrFontRefData::SetNoAntiAliasing(bool no) -{ - m_noAA = no; -} - - void wxFontMgrFontRefData::EnsureValidFont() { if ( !m_fontValid )