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

diff --git a/contrib/src/xml/xh_chckl.cpp b/contrib/src/xml/xh_chckl.cpp
index 7f709b14a417bacb3e17f209f98d7eb637a294a0..492054006ace2e2ee9b3be1fab3fcd170599b589 100644 (file)
--- a/contrib/src/xml/xh_chckl.cpp
+++ b/contrib/src/xml/xh_chckl.cpp
@@ -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();

diff --git a/contrib/src/xml/xh_choic.cpp b/contrib/src/xml/xh_choic.cpp
index ea39ffb94b65b230b17866d75199e42005b134a2..414ce981cbb81cd1dec7b731dbe5a008c9e4449c 100644 (file)
--- a/contrib/src/xml/xh_choic.cpp
+++ b/contrib/src/xml/xh_choic.cpp
@@ -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 )
         {

diff --git a/contrib/src/xml/xh_combo.cpp b/contrib/src/xml/xh_combo.cpp
index 115e87f1adf996555a5d785f08732b215263fd4f..acf344e28c7204bf201112aaa40c3c7b505ccf62 100644 (file)
--- a/contrib/src/xml/xh_combo.cpp
+++ b/contrib/src/xml/xh_combo.cpp
@@ -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 )
         {

diff --git a/contrib/src/xml/xh_radbx.cpp b/contrib/src/xml/xh_radbx.cpp
index 0b1e6f13f4f31f277d93f317ce0957a07f7f9e1f..c148284f8950977bdb5bd6592a8c5f05a0ccf204 100644 (file)
--- a/contrib/src/xml/xh_radbx.cpp
+++ b/contrib/src/xml/xh_radbx.cpp
@@ -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 )
         {