X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea0d8ca6e89a677871a214f5e4e8c50422a0cfb8..1d529ef7eed851db9d007821decb9639e4e7fc16:/contrib/src/xrc/xh_sizer.cpp diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp index 5022ffb8f4..3473ccd023 100644 --- a/contrib/src/xrc/xh_sizer.cpp +++ b/contrib/src/xrc/xh_sizer.cpp @@ -175,7 +175,7 @@ wxObject* wxSizerXmlHandler::Handle_sizer() wxXmlNode *parentNode = m_node->GetParent(); wxCHECK_MSG(m_parentSizer != NULL || - (parentNode->GetType() == wxXML_ELEMENT_NODE && + (parentNode && parentNode->GetType() == wxXML_ELEMENT_NODE && m_parentAsWindow != NULL && (m_parentAsWindow->IsKindOf(CLASSINFO(wxPanel)) || m_parentAsWindow->IsKindOf(CLASSINFO(wxFrame)) || @@ -206,7 +206,6 @@ wxObject* wxSizerXmlHandler::Handle_sizer() // save state wxSizer *old_par = m_parentSizer; bool old_ins = m_isInside; - bool old_gbs = m_isGBS; // set new state m_parentSizer = sizer; @@ -216,7 +215,6 @@ wxObject* wxSizerXmlHandler::Handle_sizer() CreateChildren(m_parent, TRUE/*only this handler*/); // restore state - old_gbs = m_isGBS; m_isInside = old_ins; m_parentSizer = old_par;