From 8ea3336c3fd717fb0cc51e53a5466f1152d9fa7e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 11 Dec 2003 08:06:08 +0000 Subject: [PATCH] Applied patch [ 816021 ] SetFont without m_widget git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 4 +--- src/gtk1/window.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index e44b95f352..3f5884de67 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -4289,9 +4289,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 e44b95f352..3f5884de67 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -4289,9 +4289,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; }