From d53f93f607b82fdaba63d0cc1d9422c5a3578a4e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 10 May 2014 16:15:46 +0000 Subject: [PATCH] Fix wxRichTextCtrl code compilation with wxUSE_XML==0. Add missing wxUSE_XML checks. Closes #16251. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index ae168617e6..54203e53c6 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -11406,6 +11406,7 @@ public: wxRichTextBuffer::InitStandardHandlers(); wxRichTextParagraph::InitDefaultTabs(); +#if wxUSE_XML wxRichTextXMLHandler::RegisterNodeName(wxT("text"), wxT("wxRichTextPlainText")); wxRichTextXMLHandler::RegisterNodeName(wxT("symbol"), wxT("wxRichTextPlainText")); wxRichTextXMLHandler::RegisterNodeName(wxT("image"), wxT("wxRichTextImage")); @@ -11415,6 +11416,7 @@ public: wxRichTextXMLHandler::RegisterNodeName(wxT("cell"), wxT("wxRichTextCell")); wxRichTextXMLHandler::RegisterNodeName(wxT("table"), wxT("wxRichTextTable")); wxRichTextXMLHandler::RegisterNodeName(wxT("field"), wxT("wxRichTextField")); +#endif // wxUSE_XML return true; } @@ -11423,7 +11425,9 @@ public: wxRichTextBuffer::CleanUpHandlers(); wxRichTextBuffer::CleanUpDrawingHandlers(); wxRichTextBuffer::CleanUpFieldTypes(); +#if wxUSE_XML wxRichTextXMLHandler::ClearNodeToClassMap(); +#endif // wxUSE_XML wxRichTextDecimalToRoman(-1); wxRichTextParagraph::ClearDefaultTabs(); wxRichTextCtrl::ClearAvailableFontNames();