X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09dc1241b72e4c03d2ebd757bb063296aef7a18e..b1229561e530e829f61887930f2004d9814743b0:/contrib/src/xml/xh_choic.cpp?ds=inline diff --git a/contrib/src/xml/xh_choic.cpp b/contrib/src/xml/xh_choic.cpp index 6ffec1f04d..2e5918236d 100644 --- a/contrib/src/xml/xh_choic.cpp +++ b/contrib/src/xml/xh_choic.cpp @@ -31,15 +31,14 @@ wxChoiceXmlHandler::wxChoiceXmlHandler() wxObject *wxChoiceXmlHandler::DoCreateResource() { - if( m_Node->GetName() == _T("choice")) + if( m_Class == _T("wxChoice")) { // find the selection long selection = GetLong( _T("selection"), -1 ); // need to build the list of strings from children m_InsideBox = TRUE; - CreateChildren( NULL, TRUE /* only this handler */, - GetParamNode(_T("content"))); + CreateChildrenPrivately( NULL, GetParamNode(_T("content"))); wxString *strings = (wxString *) NULL; if( strList.GetCount() > 0 ) { @@ -88,10 +87,9 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) { - return( node->GetName() == _T("choice") || - ( m_InsideBox && - node->GetName() == _T("item" )) - ); + return (IsOfClass(node, _T("wxChoice")) || + (m_InsideBox && node->GetName() == _T("item")) + ); }