don't crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -175,7 +175,7 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
|
|||||||
wxXmlNode *parentNode = m_node->GetParent();
|
wxXmlNode *parentNode = m_node->GetParent();
|
||||||
|
|
||||||
wxCHECK_MSG(m_parentSizer != NULL ||
|
wxCHECK_MSG(m_parentSizer != NULL ||
|
||||||
(parentNode->GetType() == wxXML_ELEMENT_NODE &&
|
(parentNode && parentNode->GetType() == wxXML_ELEMENT_NODE &&
|
||||||
m_parentAsWindow != NULL &&
|
m_parentAsWindow != NULL &&
|
||||||
(m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
|
(m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
|
||||||
m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
|
m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
|
||||||
|
@@ -175,7 +175,7 @@ wxObject* wxSizerXmlHandler::Handle_sizer()
|
|||||||
wxXmlNode *parentNode = m_node->GetParent();
|
wxXmlNode *parentNode = m_node->GetParent();
|
||||||
|
|
||||||
wxCHECK_MSG(m_parentSizer != NULL ||
|
wxCHECK_MSG(m_parentSizer != NULL ||
|
||||||
(parentNode->GetType() == wxXML_ELEMENT_NODE &&
|
(parentNode && parentNode->GetType() == wxXML_ELEMENT_NODE &&
|
||||||
m_parentAsWindow != NULL &&
|
m_parentAsWindow != NULL &&
|
||||||
(m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
|
(m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) ||
|
||||||
m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
|
m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) ||
|
||||||
|
Reference in New Issue
Block a user