X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56d2f75071fc2a29ec10abe97c5a908bb35f30f4..b1229561e530e829f61887930f2004d9814743b0:/contrib/src/xml/xh_choic.cpp

diff --git a/contrib/src/xml/xh_choic.cpp b/contrib/src/xml/xh_choic.cpp
index ea39ffb94b..2e5918236d 100644
--- a/contrib/src/xml/xh_choic.cpp
+++ b/contrib/src/xml/xh_choic.cpp
@@ -26,18 +26,19 @@ wxChoiceXmlHandler::wxChoiceXmlHandler()
 : wxXmlResourceHandler() , m_InsideBox(FALSE)
 {
     ADD_STYLE(wxCB_SORT);
+    AddWindowStyles();
 }
 
 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;
-        CreateChildren( NULL, TRUE /* only this handler */);
+        CreateChildrenPrivately( NULL, GetParamNode(_T("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -86,10 +87,9 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
 
 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"))
+           );
 }