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 4369b0a4d7ed1a5d013c75c11efa050f7c2a47bf..cf9d48a9f5ae924b89b8a8495d899b78d5d12d66 100644 (file)
--- 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 4369b0a4d7ed1a5d013c75c11efa050f7c2a47bf..cf9d48a9f5ae924b89b8a8495d899b78d5d12d66 100644 (file)
--- 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;
     }