Applied #14000 (wxRichTextXMLHandler interface fixes)

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

diff --git a/interface/wx/richtext/richtextxml.h b/interface/wx/richtext/richtextxml.h
index 3f1c8be54d2951e0d80948bf8dd99b1e65d886a7..8f4b262f7d0039d29eefb67b66d9dd7b9ad59bcd 100644 (file)
--- a/interface/wx/richtext/richtextxml.h
+++ b/interface/wx/richtext/richtextxml.h
@@ -49,19 +49,11 @@ public:
     */
     virtual bool CanSave() const;
 
     */
     virtual bool CanSave() const;
 

-    /**
-        Creates XML code for a given character or paragraph style.
-    */
-    wxString CreateStyle(const wxTextAttr& attr, bool isPara = false);
-

     /**
         Recursively exports an object to the stream.
     */
     /**
         Recursively exports an object to the stream.
     */

-    bool ExportXML(wxOutputStream& stream, wxMBConv* convMem,
-                   wxMBConv* convFile,
-                   wxRichTextObject& obj,
-                   int level);
-
+    bool ExportXML(wxOutputStream& stream, wxRichTextObject& obj, int level);
+    

     /**
         Helper function: gets node context.
     */
     /**
         Helper function: gets node context.
     */


@@ -77,12 +69,6 @@ public:
     */
     wxString GetParamValue(wxXmlNode* node, const wxString& param);
 
     */
     wxString GetParamValue(wxXmlNode* node, const wxString& param);
 

-    /**
-        Helper function: gets style parameters from the given XML node.
-    */
-    bool GetStyle(wxTextAttr& attr, wxXmlNode* node,
-                  bool isPara = false);
-

     /**
         Helper function: gets text from the node.
     */
     /**
         Helper function: gets text from the node.
     */


@@ -98,7 +84,7 @@ public:
     /**
         Recursively imports an object.
     */
     /**
         Recursively imports an object.
     */

-    bool ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node);
+    bool ImportXML(wxRichTextBuffer* buffer, wxRichTextObject* obj, wxXmlNode* node);

 
 protected:
 
 
 protected: