The last commit was too hasty.

[wxWidgets.git] / contrib / src / xrc / xh_radbt.cpp

diff --git a/contrib/src/xrc/xh_radbt.cpp b/contrib/src/xrc/xh_radbt.cpp
index a850d4443713790ee12f64476481b531967bcac1..a117b1b9d0f95ce7480244c978760da3e94d3d01 100644 (file)
--- a/contrib/src/xrc/xh_radbt.cpp
+++ b/contrib/src/xrc/xh_radbt.cpp
@@ -27,7 +27,7 @@
 wxRadioButtonXmlHandler::wxRadioButtonXmlHandler() 
 : wxXmlResourceHandler() 
 {
-    ADD_STYLE( wxRB_GROUP );
+    XRC_ADD_STYLE(wxRB_GROUP);
     AddWindowStyles();
 }
 
@@ -40,10 +40,7 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
      * normal radio button.
      */ 
 
-    wxRadioButton *control = wxStaticCast(m_instance, wxRadioButton);
-
-    if (!control)
-       control = new wxRadioButton;
+    XRC_MAKE_INSTANCE(control, wxRadioButton)
 
     control->Create(m_parentAsWindow,
                     GetID(),
@@ -53,18 +50,15 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
                     wxDefaultValidator,
                     GetName());
 
-    control->SetValue( GetBool(wxT("value"), 0));
+    control->SetValue(GetBool(wxT("value"), 0));
     SetupWindow(control);
     
     return control;
 }
 
-
-
 bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 
-
 #endif