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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user