X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e066e2566a4e5db3510fe6a204d66850eaeceade..00b2a5df9502adfd9a14ce01ab603f7906984995:/contrib/src/xml/xh_chckl.cpp diff --git a/contrib/src/xml/xh_chckl.cpp b/contrib/src/xml/xh_chckl.cpp index 826709bc9c..928f486511 100644 --- a/contrib/src/xml/xh_chckl.cpp +++ b/contrib/src/xml/xh_chckl.cpp @@ -23,7 +23,7 @@ #include "wx/checklst.h" wxCheckListXmlHandler::wxCheckListXmlHandler() -: wxXmlResourceHandler(), m_InsideBox(FALSE) +: wxXmlResourceHandler(), m_insideBox(FALSE) { // no styles AddWindowStyles(); @@ -31,11 +31,11 @@ wxCheckListXmlHandler::wxCheckListXmlHandler() wxObject *wxCheckListXmlHandler::DoCreateResource() { - if (m_Class == _T("wxCheckList")) + if (m_class == wxT("wxCheckList")) { // need to build the list of strings from children - m_InsideBox = TRUE; - CreateChildrenPrivately(NULL, GetParamNode(_T("content"))); + m_insideBox = TRUE; + CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; if( strList.GetCount() > 0 ) { @@ -46,7 +46,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource() } - wxCheckListBox *control = new wxCheckListBox(m_ParentAsWindow, + wxCheckListBox *control = new wxCheckListBox(m_parentAsWindow, GetID(), GetPosition(), GetSize(), strList.GetCount(), @@ -57,19 +57,19 @@ wxObject *wxCheckListXmlHandler::DoCreateResource() ); // step through children myself (again.) - wxXmlNode *n = GetParamNode(_T("content")); + wxXmlNode *n = GetParamNode(wxT("content")); if (n) n = n->GetChildren(); int i = 0; while (n) { if (n->GetType() != wxXML_ELEMENT_NODE || - n->GetName() != _T("item")) + n->GetName() != wxT("item")) { n = n->GetNext(); continue; } // checking boolean is a bit ugly here (see GetBool() ) - wxString v = n->GetPropVal(_T("checked"), wxEmptyString); + wxString v = n->GetPropVal(wxT("checked"), wxEmptyString); v.MakeLower(); - if (v && v == _T("1")) + if (v && v == wxT("1")) control->Check( i, TRUE ); i++; @@ -90,7 +90,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource() // handle Label // add to the list - strList.Add( GetNodeContent(m_Node) ); + strList.Add( GetNodeContent(m_node) ); return NULL; } @@ -101,8 +101,8 @@ wxObject *wxCheckListXmlHandler::DoCreateResource() bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) { - return (IsOfClass(node, _T("wxCheckList")) || - (m_InsideBox && node->GetName() == _T("item")) + return (IsOfClass(node, wxT("wxCheckList")) || + (m_insideBox && node->GetName() == wxT("item")) ); }