From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 18 Jun 2004 07:30:08 +0000 (+0000)
Subject: new logic applies to SetFont(wxNullFont), too
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/72bbf76a54b76b8b0b1a72b0ea2a7655d5dc2acd?ds=inline

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 26c63a13f5..e7d8c7768a 100644
--- 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;
 }