fixed bug due to missing break in GetColourFromGTKWidget() (part of patch 1160117)

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

diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp
index 01c5ece4f0dc487dacee7585c982225e405a6bd6..a4a07a74ed0449ca9bcd0f9fd428ca1b3e824430 100644 (file)
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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,17 +19,18 @@
     #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()
 {
     XRC_ADD_STYLE(wxRB_GROUP);
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButtonXmlHandler, wxXmlResourceHandler)
 
 wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
 : wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxRB_GROUP);

+    XRC_ADD_STYLE(wxRB_SINGLE);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -63,4 +64,4 @@ bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_RADIOBTN