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

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

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index d95d17e9b8bd98a93725ab262078cdc6e4f00417..7d8ae347281edb71089250948ff5f4403169456f 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "xh_scrol.h"
 #endif
 
 #pragma implementation "xh_scrol.h"
 #endif
 


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

-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC && wxUSE_SCROLLBAR

 
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
 
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"


@@ -61,4 +61,4 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 

-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR