X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56d2f75071fc2a29ec10abe97c5a908bb35f30f4..8173fefe0a9d61cfe5244a301044aa2269bc1c31:/contrib/src/xml/xh_combo.cpp

diff --git a/contrib/src/xml/xh_combo.cpp b/contrib/src/xml/xh_combo.cpp
index 115e87f1ad..e69a343b1c 100644
--- a/contrib/src/xml/xh_combo.cpp
+++ b/contrib/src/xml/xh_combo.cpp
@@ -25,24 +25,25 @@
 #if wxUSE_COMBOBOX
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
+: wxXmlResourceHandler() , m_insideBox(FALSE)
 {
     ADD_STYLE(wxCB_SIMPLE);
     ADD_STYLE(wxCB_SORT);
     ADD_STYLE(wxCB_READONLY);
     ADD_STYLE(wxCB_DROPDOWN);
+    AddWindowStyles();
 }
 
 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 */);
+        m_insideBox = TRUE;
+        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -53,9 +54,9 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         }
 
 
-        wxComboBox *control = new wxComboBox(m_ParentAsWindow,
+        wxComboBox *control = new wxComboBox(m_parentAsWindow,
                                     GetID(),
-                                    GetText(_T("value")),
+                                    GetText(wxT("value")),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),
                                     strings,
@@ -81,7 +82,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        strList.Add( GetNodeContent(m_Node) );
+        strList.Add( GetNodeContent(m_node) );
 
         return NULL;
     }
@@ -92,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