X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09dc1241b72e4c03d2ebd757bb063296aef7a18e..f0ce3409421a7c5c800a2255295274187220e8de:/contrib/src/xml/xh_combo.cpp

diff --git a/contrib/src/xml/xh_combo.cpp b/contrib/src/xml/xh_combo.cpp
index 54c029431b..4f80166701 100644
--- a/contrib/src/xml/xh_combo.cpp
+++ b/contrib/src/xml/xh_combo.cpp
@@ -36,15 +36,14 @@ wxComboBoxXmlHandler::wxComboBoxXmlHandler()
 
 wxObject *wxComboBoxXmlHandler::DoCreateResource()
 { 
-    if( m_Node->GetName() == _T("combobox"))
+    if( m_Class == wxT("wxComboBox"))
     {
         // find the selection
-        long selection = GetLong( _T("selection"), -1 );
+        long selection = GetLong( wxT("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(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -57,7 +56,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
 
         wxComboBox *control = new wxComboBox(m_ParentAsWindow,
                                     GetID(),
-                                    GetText(_T("value")),
+                                    GetText(wxT("value")),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),
                                     strings,
@@ -94,10 +93,9 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
 
 bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return( node->GetName() == _T("combobox") ||
-        ( m_InsideBox &&
-            node->GetName() == _T("item" )) 
-        );
+    return (IsOfClass(node, wxT("wxComboBox")) ||
+           (m_InsideBox && node->GetName() == wxT("item"))
+           );
 }
 
 #endif