Warning fixes, source cleaning.

[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 9caa453e627f59730189f05cc488cb366ebedb40..01c5ece4f0dc487dacee7585c982225e405a6bd6 100644 (file)
--- a/contrib/src/xrc/xh_radbt.cpp
+++ b/contrib/src/xrc/xh_radbt.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // 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
 #ifdef __GNUG__
 #pragma implementation "xh_radbt.h"
 #endif


@@ -24,43 +24,43 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

-wxRadioButtonXmlHandler::wxRadioButtonXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxRadioButtonXmlHandler, wxXmlResourceHandler)
+
+wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
+: wxXmlResourceHandler()

 {
 {

-    ADD_STYLE( wxRB_GROUP );
+    XRC_ADD_STYLE(wxRB_GROUP);

     AddWindowStyles();
 }
 
 wxObject *wxRadioButtonXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxRadioButtonXmlHandler::DoCreateResource()

-{ 
+{

     /* BOBM - implementation note.
      * once the wxBitmapRadioButton is implemented.
     /* 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.
      * normal radio button.

-     */ 
+     */
+
+    XRC_MAKE_INSTANCE(control, wxRadioButton)

 
 

-    wxRadioButton *control = new wxRadioButton(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetText(wxT("label")),
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());

 
 

-    control->SetValue( GetBool(wxT("value"), 0));
+    control->SetValue(GetBool(wxT("value"), 0));

     SetupWindow(control);
     SetupWindow(control);

-    
+

     return control;
 }
 
     return control;
 }
 

-
-

 bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 
 bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 

-

 #endif
 #endif