added 'name' to wxEditableListBox ctor

[wxWidgets.git] / contrib / src / xml / xh_chckl.cpp

diff --git a/contrib/src/xml/xh_chckl.cpp b/contrib/src/xml/xh_chckl.cpp
index 7f709b14a417bacb3e17f209f98d7eb637a294a0..928f48651168e808fcc5d946e431536f264e57db 100644 (file)
--- a/contrib/src/xml/xh_chckl.cpp
+++ b/contrib/src/xml/xh_chckl.cpp
@@ -23,18 +23,19 @@
 #include "wx/checklst.h"
 
 wxCheckListXmlHandler::wxCheckListXmlHandler() 
-: wxXmlResourceHandler(), m_InsideBox(FALSE)
+: wxXmlResourceHandler(), m_insideBox(FALSE)
 {
     // no styles
+    AddWindowStyles();
 }
 
 wxObject *wxCheckListXmlHandler::DoCreateResource()
 { 
-    if( m_Node->GetName() == _T("checklist"))
+    if (m_class == wxT("wxCheckList"))
     {
         // need to build the list of strings from children
-        m_InsideBox = TRUE;
-        CreateChildren( NULL, TRUE /* only this handler */);
+        m_insideBox = TRUE;
+        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -45,7 +46,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         }
 
 
-        wxCheckListBox *control = new wxCheckListBox(m_ParentAsWindow,
+        wxCheckListBox *control = new wxCheckListBox(m_parentAsWindow,
                                     GetID(),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),
@@ -56,26 +57,20 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
                                     );
 
         // step through children myself (again.)
-        wxXmlNode *n = GetParamNode(_T("children"));
+        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)
-            {
-                if( v == _T("1") || v == _T("t") || v == _T("yes") ||
-                v == _T("on") || v == _T("true") )
-                {
-                    control->Check( i, TRUE );
-                }
-            }
+            if (v && v == wxT("1"))
+                control->Check( i, TRUE );
 
             i++;        
             n = n->GetNext();
@@ -95,7 +90,7 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         // handle <item checked="boolean">Label</item>
 
         // add to the list
-        strList.Add( GetNodeContent(m_Node) );
+        strList.Add( GetNodeContent(m_node) );
 
         return NULL;
     }
@@ -106,10 +101,9 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
 
 bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return( node->GetName() == _T("checklist") ||
-        ( m_InsideBox &&
-            node->GetName() == _T("item" )) 
-        );
+    return (IsOfClass(node, wxT("wxCheckList")) ||
+           (m_insideBox && node->GetName() == wxT("item"))
+           );
 }