new logic applies to SetFont(wxNullFont), too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-18 07:30:08 +00:00
parent fb44fc34e8
commit 72bbf76a54

View File

@@ -1062,9 +1062,6 @@ wxFont& wxWindowBase::DoGetFont() const
bool wxWindowBase::SetFont(const wxFont& font) bool wxWindowBase::SetFont(const wxFont& font)
{ {
if ( !font.Ok() )
return false;
if ( font == m_font ) if ( font == m_font )
{ {
// no change // no change
@@ -1072,8 +1069,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
} }
m_font = font; m_font = font;
m_hasFont = font.Ok();
m_hasFont = true;
return true; return true;
} }