1) some cleanup in wxHtmlWindow, moved private structures out of headers

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

diff --git a/contrib/src/xml/xh_radbx.cpp b/contrib/src/xml/xh_radbx.cpp
index 0b1e6f13f4f31f277d93f317ce0957a07f7f9e1f..eba8f45be780cb6e986e259bdd739649d3f00df3 100644 (file)
--- a/contrib/src/xml/xh_radbx.cpp
+++ b/contrib/src/xml/xh_radbx.cpp
@@ -31,18 +31,19 @@ wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
     ADD_STYLE(wxRA_HORIZONTAL);
     ADD_STYLE(wxRA_SPECIFY_ROWS);
     ADD_STYLE(wxRA_VERTICAL);
+    AddWindowStyles();
 }
 
 wxObject *wxRadioBoxXmlHandler::DoCreateResource()
 { 
-    if( m_Node->GetName() == _T("radiobox"))
+    if( m_Class == wxT("wxRadioBox"))
     {
         // 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("buttons")));
+        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -55,11 +56,11 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
 
         wxRadioBox *control = new wxRadioBox(m_ParentAsWindow,
                                     GetID(),
-                                    GetText(_T("label")),
+                                    GetText(wxT("label")),
                                     GetPosition(), GetSize(),
                                     strList.GetCount(),
                                     strings,
-                                    GetLong( _T("dimension"), 0 ),
+                                    GetLong( wxT("dimension"), 1 ),
                                     GetStyle(),
                                     wxDefaultValidator,
                                     GetName()
@@ -93,10 +94,9 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
 
 bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return( node->GetName() == _T("radiobox") ||
-        ( m_InsideBox &&
-            node->GetName() == _T("item" )) 
-        );
+    return (IsOfClass(node, wxT("wxRadioBox")) ||
+           (m_InsideBox && node->GetName() == wxT("item"))
+           );
 }
 
 #endif