test for bug with new wu-ftpd

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

diff --git a/contrib/src/xml/xh_choic.cpp b/contrib/src/xml/xh_choic.cpp
index 4ee1a0fe7bb06dbac894a357268e0e9a6f8efbf6..2e5918236d071669cdd2d6f7aa4a9290373a2a3b 100644 (file)
--- a/contrib/src/xml/xh_choic.cpp
+++ b/contrib/src/xml/xh_choic.cpp
@@ -26,19 +26,19 @@ wxChoiceXmlHandler::wxChoiceXmlHandler()
 : wxXmlResourceHandler() , m_InsideBox(FALSE)
 {
     ADD_STYLE(wxCB_SORT);
 : wxXmlResourceHandler() , m_InsideBox(FALSE)
 {
     ADD_STYLE(wxCB_SORT);

+    AddWindowStyles();

 }
 
 wxObject *wxChoiceXmlHandler::DoCreateResource()
 { 
 }
 
 wxObject *wxChoiceXmlHandler::DoCreateResource()
 { 

-    if( m_Node->GetName() == _T("choice"))
+    if( m_Class == _T("wxChoice"))

     {
         // find the selection
         long selection = GetLong( _T("selection"), -1 );
 
         // need to build the list of strings from children
         m_InsideBox = TRUE;
     {
         // find the selection
         long selection = GetLong( _T("selection"), -1 );
 
         // need to build the list of strings from children
         m_InsideBox = TRUE;

-        CreateChildren( NULL, TRUE /* only this handler */, 
-                        GetParamNode(_T("content")));
+        CreateChildrenPrivately( NULL, GetParamNode(_T("content")));

         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {


@@ -87,10 +87,9 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
 
 bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return( node->GetName() == _T("choice") ||
-        ( m_InsideBox &&
-            node->GetName() == _T("item" )) 
-        );
+    return (IsOfClass(node, _T("wxChoice")) ||
+           (m_InsideBox && node->GetName() == _T("item"))
+           );

 }
 
 
 }