Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove HasNativeFontInfo() which always returns true now but was left for some reason

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-25 13:54:24 +00:00
parent 4bf3e3a702
commit 7c6e85dc64
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/font.cpp
View File

@@ -264,9 +264,6 @@ public:
m_nativeFontInfo.SetEncoding(encoding); m_nativeFontInfo.SetEncoding(encoding);
} }
// native font info
bool HasNativeFontInfo() const { return true; }
const wxNativeFontInfo& GetNativeFontInfo() const const wxNativeFontInfo& GetNativeFontInfo() const
{ return m_nativeFontInfo; } { return m_nativeFontInfo; }
@@ -1031,8 +1028,7 @@ wxFontEncoding wxFont::GetEncoding() const
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{ {
return IsOk() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;
: NULL;
} }
wxString wxFont::GetNativeFontInfoDesc() const wxString wxFont::GetNativeFontInfoDesc() const
@@ -1057,15 +1053,10 @@ bool wxFont::IsFixedWidth() const
{ {
wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
if ( M_FONTDATA->HasNativeFontInfo() )
{
// the two low-order bits specify the pitch of the font, the rest is // the two low-order bits specify the pitch of the font, the rest is
// family // family
BYTE pitch = BYTE pitch =
(BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK); (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
return pitch == FIXED_PITCH; return pitch == FIXED_PITCH;
}
return wxFontBase::IsFixedWidth();
} }