Add missing wxUSE_OLE checks to safearray.cpp.

[wxWidgets.git] / include / wx / private / markupparser.h

diff --git a/include/wx/private/markupparser.h b/include/wx/private/markupparser.h
index e0eb0a80999d4ee11031edf9d4b016accb25ba1f..9ae44ac5e08f9f65b30f18313d63e548920a07ef 100644 (file)
--- a/include/wx/private/markupparser.h
+++ b/include/wx/private/markupparser.h
@@ -70,10 +70,15 @@ struct wxMarkupSpanAttributes
 // wxMarkupParserOutput: gathers the results of parsing markup.
 // ----------------------------------------------------------------------------
 
+// A class deriving directly from this one needs to implement all the pure
+// virtual functions below but as the handling of all simple tags (bold, italic
+// &c) is often very similar, it is usually more convenient to inherit from
+// wxMarkupParserFontOutput defined in wx/private/markupparserfont.h instead.
 class wxMarkupParserOutput
 {
 public:
     wxMarkupParserOutput() { }
+    virtual ~wxMarkupParserOutput() { }
 
     // Virtual functions called by wxMarkupParser while parsing the markup.
 
@@ -136,6 +141,11 @@ public:
     // interpreted as tag opening characters.
     static wxString Quote(const wxString& text);
 
+    // Strip markup from a string, i.e. simply remove all tags and replace
+    // XML entities with their values (or with "&&" in case of "&" to
+    // prevent it from being interpreted as mnemonic marker).
+    static wxString Strip(const wxString& text);
+
 private:
     // Simple struct combining the name of a tag and its attributes.
     struct TagAndAttrs