Don't compile rich text handler unless wxUSE_RICHTEXT_XML_HANDLER is 1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index 73f64a57ee696a82a02b88430b26f71b1794f592..0424611ed3f30911525077144399e5361d930f42 100644 (file)
--- a/include/wx/xrc/xh_all.h
+++ b/include/wx/xrc/xh_all.h
@@ -67,6 +67,5 @@
 #include "wx/xrc/xh_bmpcbox.h"
 #include "wx/xrc/xh_animatctrl.h"
 #include "wx/xrc/xh_collpane.h"
-#include "wx/xrc/xh_richtext.h"
 
 #endif // _WX_XH_ALL_H_

diff --git a/src/xrc/xh_richtext.cpp b/src/xrc/xh_richtext.cpp
index f8b08cc839fc5c367b2599fcf054fa3b80e8f957..0d8146785ff7a76489ae9c307f2fc0404179ae32 100644 (file)
--- a/src/xrc/xh_richtext.cpp
+++ b/src/xrc/xh_richtext.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_RICHTEXT
+#if wxUSE_XRC && wxUSE_RICHTEXT && wxUSE_RICHTEXT_XML_HANDLER
 
 #include "wx/xrc/xh_richtext.h"