Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxRichTextCtrl code compilation with wxUSE_XML==0.

Browse Source 
Add missing wxUSE_XML checks.

Closes #16251.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-10 16:15:46 +00:00
parent 56fe5f9404
commit d53f93f607
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/richtext/richtextbuffer.cpp
View File

@@ -11406,6 +11406,7 @@ public:
wxRichTextBuffer::InitStandardHandlers(); wxRichTextBuffer::InitStandardHandlers();
wxRichTextParagraph::InitDefaultTabs(); wxRichTextParagraph::InitDefaultTabs();
#if wxUSE_XML
wxRichTextXMLHandler::RegisterNodeName(wxT("text"), wxT("wxRichTextPlainText")); wxRichTextXMLHandler::RegisterNodeName(wxT("text"), wxT("wxRichTextPlainText"));
wxRichTextXMLHandler::RegisterNodeName(wxT("symbol"), wxT("wxRichTextPlainText")); wxRichTextXMLHandler::RegisterNodeName(wxT("symbol"), wxT("wxRichTextPlainText"));
wxRichTextXMLHandler::RegisterNodeName(wxT("image"), wxT("wxRichTextImage")); wxRichTextXMLHandler::RegisterNodeName(wxT("image"), wxT("wxRichTextImage"));
@@ -11415,6 +11416,7 @@ public:
wxRichTextXMLHandler::RegisterNodeName(wxT("cell"), wxT("wxRichTextCell")); wxRichTextXMLHandler::RegisterNodeName(wxT("cell"), wxT("wxRichTextCell"));
wxRichTextXMLHandler::RegisterNodeName(wxT("table"), wxT("wxRichTextTable")); wxRichTextXMLHandler::RegisterNodeName(wxT("table"), wxT("wxRichTextTable"));
wxRichTextXMLHandler::RegisterNodeName(wxT("field"), wxT("wxRichTextField")); wxRichTextXMLHandler::RegisterNodeName(wxT("field"), wxT("wxRichTextField"));
#endif // wxUSE_XML
return true; return true;
} }
@@ -11423,7 +11425,9 @@ public:
wxRichTextBuffer::CleanUpHandlers(); wxRichTextBuffer::CleanUpHandlers();
wxRichTextBuffer::CleanUpDrawingHandlers(); wxRichTextBuffer::CleanUpDrawingHandlers();
wxRichTextBuffer::CleanUpFieldTypes(); wxRichTextBuffer::CleanUpFieldTypes();
#if wxUSE_XML
wxRichTextXMLHandler::ClearNodeToClassMap(); wxRichTextXMLHandler::ClearNodeToClassMap();
#endif // wxUSE_XML
wxRichTextDecimalToRoman(-1); wxRichTextDecimalToRoman(-1);
wxRichTextParagraph::ClearDefaultTabs(); wxRichTextParagraph::ClearDefaultTabs();
wxRichTextCtrl::ClearAvailableFontNames(); wxRichTextCtrl::ClearAvailableFontNames();