X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09dc1241b72e4c03d2ebd757bb063296aef7a18e..8173fefe0a9d61cfe5244a301044aa2269bc1c31:/contrib/src/xml/xh_listb.cpp diff --git a/contrib/src/xml/xh_listb.cpp b/contrib/src/xml/xh_listb.cpp index 9d4bae282d..064e43b9ad 100644 --- a/contrib/src/xml/xh_listb.cpp +++ b/contrib/src/xml/xh_listb.cpp @@ -23,7 +23,7 @@ #include "wx/listbox.h" wxListBoxXmlHandler::wxListBoxXmlHandler() -: wxXmlResourceHandler() , m_InsideBox(FALSE) +: wxXmlResourceHandler() , m_insideBox(FALSE) { ADD_STYLE(wxLB_SINGLE); ADD_STYLE(wxLB_MULTIPLE); @@ -37,15 +37,14 @@ wxListBoxXmlHandler::wxListBoxXmlHandler() wxObject *wxListBoxXmlHandler::DoCreateResource() { - if( m_Node->GetName() == _T("listbox")) + if( m_class == wxT("wxListBox")) { // find the selection - long selection = GetLong( _T("selection"), -1 ); + long selection = GetLong( wxT("selection"), -1 ); // need to build the list of strings from children - m_InsideBox = TRUE; - CreateChildren( NULL, TRUE /* only this handler */, - GetParamNode(_T("content"))); + m_insideBox = TRUE; + CreateChildrenPrivately( NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; if( strList.GetCount() > 0 ) { @@ -56,7 +55,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() } - wxListBox *control = new wxListBox(m_ParentAsWindow, + wxListBox *control = new wxListBox(m_parentAsWindow, GetID(), GetPosition(), GetSize(), strList.GetCount(), @@ -83,7 +82,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() // handle Label // add to the list - strList.Add( GetNodeContent(m_Node) ); + strList.Add( GetNodeContent(m_node) ); return NULL; } @@ -94,10 +93,9 @@ wxObject *wxListBoxXmlHandler::DoCreateResource() bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node) { - return( node->GetName() == _T("listbox") || - ( m_InsideBox && - node->GetName() == _T("item" )) - ); + return (IsOfClass(node, wxT("wxListBox")) || + (m_insideBox && node->GetName() == wxT("item")) + ); }