Close tree edit even if the change is vetoed to be consistent with MSW [patch 1110252]

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

diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp
index a850d4443713790ee12f64476481b531967bcac1..a4a07a74ed0449ca9bcd0f9fd428ca1b3e824430 100644 (file)
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_radbt.h"
 #endif
 
 #pragma implementation "xh_radbt.h"
 #endif
 


@@ -19,31 +19,31 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_RADIOBTN
+

 #include "wx/xrc/xh_radbt.h"
 #include "wx/radiobut.h"
 
 #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()
     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.

-     */ 
+     */

 
 

-    wxRadioButton *control = wxStaticCast(m_instance, wxRadioButton);
-
-    if (!control)
-       control = new wxRadioButton;
+    XRC_MAKE_INSTANCE(control, wxRadioButton)

 
     control->Create(m_parentAsWindow,
                     GetID(),
 
     control->Create(m_parentAsWindow,
                     GetID(),


@@ -53,18 +53,15 @@ wxObject *wxRadioButtonXmlHandler::DoCreateResource()
                     wxDefaultValidator,
                     GetName());
 
                     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 // wxUSE_XRC && wxUSE_RADIOBTN