From d2fa18d3a10b1654a029e01c7b2b1184a45290a6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 9 Jan 2009 14:02:30 +0000 Subject: [PATCH] guard against NULL win (happens during debug startup of RTTI, Clone test) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlctrl/webkit/webkit.mm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index 7e28d801ed..8926f450e4 100644 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -293,8 +293,11 @@ DEFINE_EVENT_TYPE( wxEVT_WEBKIT_STATE_CHANGED ) wxWebKitStateChangedEvent::wxWebKitStateChangedEvent( wxWindow* win ) { SetEventType( wxEVT_WEBKIT_STATE_CHANGED); - SetEventObject( win ); - SetId(win->GetId()); + if ( win ) + { + SetEventObject( win ); + SetId(win->GetId()); + } } IMPLEMENT_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent, wxCommandEvent ) @@ -305,8 +308,11 @@ wxWebKitBeforeLoadEvent::wxWebKitBeforeLoadEvent( wxWindow* win ) { m_cancelled = false; SetEventType( wxEVT_WEBKIT_BEFORE_LOAD); - SetEventObject( win ); - SetId(win->GetId()); + if ( win ) + { + SetEventObject( win ); + SetId(win->GetId()); + } } @@ -317,8 +323,11 @@ DEFINE_EVENT_TYPE( wxEVT_WEBKIT_NEW_WINDOW ) wxWebKitNewWindowEvent::wxWebKitNewWindowEvent( wxWindow* win ) { SetEventType( wxEVT_WEBKIT_NEW_WINDOW); - SetEventObject( win ); - SetId(win->GetId()); + if ( win ) + { + SetEventObject( win ); + SetId(win->GetId()); + } } -- 2.45.2