From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 11 Dec 2003 08:06:08 +0000 (+0000)
Subject: Applied patch [ 816021 ] SetFont without m_widget
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/133fb2a3a0b64e6171049db8d1ed0fc1d9bb4bd9

Applied patch [ 816021 ] SetFont without m_widget


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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4369b0a4d7..cf9d48a9f5 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4281,9 +4281,7 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window )
 
 bool wxWindowGTK::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
-
-    if (!wxWindowBase::SetFont(font))
+    if (!wxWindowBase::SetFont(font) || !m_widget)
     {
         return FALSE;
     }
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 4369b0a4d7..cf9d48a9f5 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4281,9 +4281,7 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window )
 
 bool wxWindowGTK::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
-
-    if (!wxWindowBase::SetFont(font))
+    if (!wxWindowBase::SetFont(font) || !m_widget)
     {
         return FALSE;
     }