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

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

diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index 426a3746adbb40b810a16ddc09d44cfa5ed9c3bc..ffb27630eba1262e29a83c523e79e47e3682f66f 100644 (file)
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "xh_chckb.h"
 #endif
 
 #pragma implementation "xh_chckb.h"
 #endif
 


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

+#if wxUSE_XRC && wxUSE_CHECKBOX
+

 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
 
 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
 

-#if wxUSE_CHECKBOX
-

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
 
 wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()


@@ -59,4 +59,4 @@ bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_CHECKBOX