X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3e41b770e7826224099f190a3c92895dfc4dda5..00b2a5df9502adfd9a14ce01ab603f7906984995:/contrib/src/xml/xh_radbx.cpp

diff --git a/contrib/src/xml/xh_radbx.cpp b/contrib/src/xml/xh_radbx.cpp
index c148284f89..fcf365a8d7 100644
--- a/contrib/src/xml/xh_radbx.cpp
+++ b/contrib/src/xml/xh_radbx.cpp
@@ -25,24 +25,25 @@
 #if wxUSE_RADIOBOX
 
 wxRadioBoxXmlHandler::wxRadioBoxXmlHandler() 
-: wxXmlResourceHandler() , m_InsideBox(FALSE)
+: wxXmlResourceHandler() , m_insideBox(FALSE)
 {
     ADD_STYLE(wxRA_SPECIFY_COLS);
     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("content")));
+        m_insideBox = TRUE;
+        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if( strList.GetCount() > 0 )
         {
@@ -53,13 +54,13 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         }
 
 
-        wxRadioBox *control = new wxRadioBox(m_ParentAsWindow,
+        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()
@@ -82,7 +83,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // handle <item selected="boolean">Label</item>
 
         // add to the list
-        strList.Add( GetNodeContent(m_Node) );
+        strList.Add( GetNodeContent(m_node) );
 
         return NULL;
     }
@@ -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