changed content of checklist, choice, combobox, radiobox from <children> to <content>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,7 +34,8 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
|
||||
{
|
||||
// need to build the list of strings from children
|
||||
m_InsideBox = TRUE;
|
||||
CreateChildren( NULL, TRUE /* only this handler */);
|
||||
CreateChildren( NULL, TRUE /* only this handler */,
|
||||
GetParamNode(_T("content")));
|
||||
wxString *strings = (wxString *) NULL;
|
||||
if( strList.GetCount() > 0 )
|
||||
{
|
||||
@@ -56,7 +57,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
|
||||
);
|
||||
|
||||
// step through children myself (again.)
|
||||
wxXmlNode *n = GetParamNode(_T("children"));
|
||||
wxXmlNode *n = GetParamNode(_T("content"));
|
||||
if (n) n = n->GetChildren();
|
||||
int i = 0;
|
||||
while (n)
|
||||
@@ -68,14 +69,8 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
|
||||
// checking boolean is a bit ugly here (see GetBool() )
|
||||
wxString v = n->GetPropVal(_T("checked"), wxEmptyString);
|
||||
v.MakeLower();
|
||||
if (v)
|
||||
{
|
||||
if( v == _T("1") || v == _T("t") || v == _T("yes") ||
|
||||
v == _T("on") || v == _T("true") )
|
||||
{
|
||||
control->Check( i, TRUE );
|
||||
}
|
||||
}
|
||||
if (v && v == _T("1"))
|
||||
control->Check( i, TRUE );
|
||||
|
||||
i++;
|
||||
n = n->GetNext();
|
||||
|
@@ -37,7 +37,8 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
|
||||
|
||||
// need to build the list of strings from children
|
||||
m_InsideBox = TRUE;
|
||||
CreateChildren( NULL, TRUE /* only this handler */);
|
||||
CreateChildren( NULL, TRUE /* only this handler */,
|
||||
GetParamNode(_T("content"));
|
||||
wxString *strings = (wxString *) NULL;
|
||||
if( strList.GetCount() > 0 )
|
||||
{
|
||||
|
@@ -42,7 +42,8 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
|
||||
|
||||
// need to build the list of strings from children
|
||||
m_InsideBox = TRUE;
|
||||
CreateChildren( NULL, TRUE /* only this handler */);
|
||||
CreateChildren( NULL, TRUE /* only this handler */,
|
||||
GetParamNode(_T("content")));
|
||||
wxString *strings = (wxString *) NULL;
|
||||
if( strList.GetCount() > 0 )
|
||||
{
|
||||
|
@@ -42,7 +42,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
|
||||
|
||||
// need to build the list of strings from children
|
||||
m_InsideBox = TRUE;
|
||||
CreateChildren( NULL, TRUE /* only this handler */, GetParamNode(_T("buttons")));
|
||||
CreateChildren( NULL, TRUE /* only this handler */, GetParamNode(_T("content")));
|
||||
wxString *strings = (wxString *) NULL;
|
||||
if( strList.GetCount() > 0 )
|
||||
{
|
||||
|
Reference in New Issue
Block a user