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

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

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index cc97440d56d316ba43ee5cfd0fa9a92e0a7da2aa..f7fe6ae91f8483edea130ddaaee5b6b96af50ef5 100644 (file)
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_html.h"
 #endif
 
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_HTML
+#if wxUSE_XRC && wxUSE_HTML
 
 #include "wx/xrc/xh_html.h"
 
@@ -82,4 +82,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_HTML
+#endif // wxUSE_XRC && wxUSE_HTML