X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..932142005296b619b7eaf71de6c2e0fecae6d12d:/contrib/src/xrc/xh_radbx.cpp

diff --git a/contrib/src/xrc/xh_radbx.cpp b/contrib/src/xrc/xh_radbx.cpp
index 17beaac5f9..244960bd13 100644
--- a/contrib/src/xrc/xh_radbx.cpp
+++ b/contrib/src/xrc/xh_radbx.cpp
@@ -25,12 +25,12 @@
 #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);
+    XRC_ADD_STYLE(wxRA_SPECIFY_COLS);
+    XRC_ADD_STYLE(wxRA_HORIZONTAL);
+    XRC_ADD_STYLE(wxRA_SPECIFY_ROWS);
+    XRC_ADD_STYLE(wxRA_VERTICAL);
     AddWindowStyles();
 }
 
@@ -53,26 +53,26 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
                 strings[i]=strList[i];
         }
 
+        XRC_MAKE_INSTANCE(control, wxRadioBox)
 
-        wxRadioBox *control = new wxRadioBox(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetLong( wxT("dimension"), 1 ),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+        control->Create(m_parentAsWindow,
+                        GetID(),
+                        GetText(wxT("label")),
+                        GetPosition(), GetSize(),
+                        strList.GetCount(),
+                        strings,
+                        GetLong(wxT("dimension"), 1),
+                        GetStyle(),
+                        wxDefaultValidator,
+                        GetName());
 
-        if( selection != -1 )
-            control->SetSelection( selection );
+        if (selection != -1)
+            control->SetSelection(selection);
 
         SetupWindow(control);
 
-        if( strings != NULL )
-            delete [] strings;
+        if (strings != NULL)
+            delete[] strings;
         strList.Clear();    // dump the strings   
 
         return control;
@@ -83,20 +83,17 @@ 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;
     }
 
 }
 
-
-
 bool wxRadioBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxRadioBox")) ||
-           (m_insideBox && node->GetName() == wxT("item"))
-           );
+           (m_insideBox && node->GetName() == wxT("item")));
 }
 
 #endif