new logic applies to SetFont(wxNullFont), too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 26c63a13f5e14b8b6467d134ac3ffbde1ebb551b..e7d8c7768aa46f80c1ae5fdb79e0212cd35780b6 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1062,9 +1062,6 @@ wxFont& wxWindowBase::DoGetFont() const
 
 bool wxWindowBase::SetFont(const wxFont& font)
 {
-    if ( !font.Ok() )
-        return false;
-
     if ( font == m_font )
     {
         // no change
@@ -1072,8 +1069,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
     }
 
     m_font = font;
-
-    m_hasFont = true;
+    m_hasFont = font.Ok();
 
     return true;
 }