1. Yet another unit test for new stirng stuff

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

diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp
index 9caa453e627f59730189f05cc488cb366ebedb40..1e4f476baedde5bd61fad2a6e417cb27bf04d380 100644 (file)
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp
-// Purpose:     XML resource for wxRadioButton
+// Purpose:     XRC resource for wxRadioButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
+
 #ifdef __GNUG__
 #pragma implementation "xh_radbt.h"
 #endif
@@ -19,48 +19,49 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_RADIOBOX
+
 #include "wx/xrc/xh_radbt.h"
 #include "wx/radiobut.h"
 
-#if wxUSE_RADIOBOX
+IMPLEMENT_DYNAMIC_CLASS(wxRadioButtonXmlHandler, wxXmlResourceHandler)
 
-wxRadioButtonXmlHandler::wxRadioButtonXmlHandler() 
-: wxXmlResourceHandler() 
+wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
+: wxXmlResourceHandler()
 {
-    ADD_STYLE( wxRB_GROUP );
+    XRC_ADD_STYLE(wxRB_GROUP);
+    XRC_ADD_STYLE(wxRB_SINGLE);
     AddWindowStyles();
 }
 
 wxObject *wxRadioButtonXmlHandler::DoCreateResource()
-{ 
+{
     /* BOBM - implementation note.
      * once the wxBitmapRadioButton is implemented.
-     * look for a bitmap property. If not null, 
-     * make it a wxBitmapRadioButton instead of the 
+     * look for a bitmap property. If not null,
+     * make it a wxBitmapRadioButton instead of the
      * normal radio button.
-     */ 
+     */
 
-    wxRadioButton *control = new wxRadioButton(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+    XRC_MAKE_INSTANCE(control, wxRadioButton)
 
-    control->SetValue( GetBool(wxT("value"), 0));
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetText(wxT("label")),
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());
+
+    control->SetValue(GetBool(wxT("value"), 0));
     SetupWindow(control);
-    
+
     return control;
 }
 
-
-
 bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 
-
-#endif
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK