X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/xrc/xh_chckl.cpp diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp index 067f3cf7c0..a633b112a9 100644 --- a/src/xrc/xh_chckl.cpp +++ b/src/xrc/xh_chckl.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/xrc/xh_chckl.cpp -// Purpose: XRC resource for wxCheckList +// Purpose: XRC resource for wxCheckListBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ @@ -22,10 +22,9 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" + #include "wx/checklst.h" #endif -#include "wx/checklst.h" - IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler) wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() @@ -45,42 +44,26 @@ wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() wxObject *wxCheckListBoxXmlHandler::DoCreateResource() { - if (m_class == wxT("wxCheckListBox") -#if WXWIN_COMPATIBILITY_2_4 - || m_class == wxT("wxCheckList") -#endif - ) + if (m_class == wxT("wxCheckListBox")) { -#if WXWIN_COMPATIBILITY_2_4 - if (m_class == wxT("wxCheckList")) - wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead.")); -#endif // need to build the list of strings from children m_insideBox = true; CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); - wxString *strings = (wxString *) NULL; - if (strList.GetCount() > 0) - { - strings = new wxString[strList.GetCount()]; - int count = strList.GetCount(); - for(int i = 0; i < count; i++) - strings[i] = strList[i]; - } XRC_MAKE_INSTANCE(control, wxCheckListBox) control->Create(m_parentAsWindow, GetID(), GetPosition(), GetSize(), - strList.GetCount(), - strings, + strList, GetStyle(), wxDefaultValidator, GetName()); // step through children myself (again.) wxXmlNode *n = GetParamNode(wxT("content")); - if (n) n = n->GetChildren(); + if (n) + n = n->GetChildren(); int i = 0; while (n) { @@ -89,9 +72,9 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource() { n = n->GetNext(); continue; } // checking boolean is a bit ugly here (see GetBool() ) - wxString v = n->GetPropVal(wxT("checked"), wxEmptyString); + wxString v = n->GetAttribute(wxT("checked"), wxEmptyString); v.MakeLower(); - if (v && v == wxT("1")) + if (v == wxT("1")) control->Check( i, true ); i++; @@ -100,8 +83,6 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource() SetupWindow(control); - if (strings != NULL) - delete[] strings; strList.Clear(); // dump the strings return control; @@ -114,7 +95,7 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource() // add to the list wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) - str = wxGetTranslation(str); + str = wxGetTranslation(str, m_resource->GetDomain()); strList.Add(str); return NULL; } @@ -123,9 +104,6 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource() bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node) { return (IsOfClass(node, wxT("wxCheckListBox")) || -#if WXWIN_COMPATIBILITY_2_4 - IsOfClass(node, wxT("wxCheckList")) || -#endif (m_insideBox && node->GetName() == wxT("item"))); }