From d3e41b770e7826224099f190a3c92895dfc4dda5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 26 Jul 2000 21:34:26 +0000
Subject: [PATCH] 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
---
 contrib/src/xml/xh_chckl.cpp | 15 +++++----------
 contrib/src/xml/xh_choic.cpp |  3 ++-
 contrib/src/xml/xh_combo.cpp |  3 ++-
 contrib/src/xml/xh_radbx.cpp |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/contrib/src/xml/xh_chckl.cpp b/contrib/src/xml/xh_chckl.cpp
index 7f709b14a4..492054006a 100644
--- 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 ea39ffb94b..414ce981cb 100644
--- 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 115e87f1ad..acf344e28c 100644
--- 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 0b1e6f13f4..c148284f89 100644
--- 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 )
         {
-- 
2.47.2