Fix part of [ 1570325 ] wxAnimationCtrl for wxAdv library

[wxWidgets.git] / include / wx / richtext / richtexthtml.h

diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h
index 8bca5ff64461db3cec84620eacc9ba615fea1bee..23cbefced5cab98bf3951f1b001d663b055a0cb7 100644 (file)
--- a/include/wx/richtext/richtexthtml.h
+++ b/include/wx/richtext/richtexthtml.h
@@ -22,7 +22,7 @@
  * wxRichTextHTMLHandler
  */
 
-class WXDLLIMPEXP_ADV wxRichTextHTMLHandler: public wxRichTextFileHandler
+class WXDLLIMPEXP_RICHTEXT wxRichTextHTMLHandler: public wxRichTextFileHandler
 {
     DECLARE_CLASS(wxRichTextHTMLHandler)
 public:
@@ -47,8 +47,8 @@ protected:
 #endif
 
     /// Output character formatting
-    virtual void BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream );
-    virtual void EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream );
+    virtual void BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream );
+    virtual void EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream );
        
        /// Output paragraph formatting
     virtual void OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream/*, bool start*/);
@@ -69,7 +69,7 @@ protected:
        wxChar* b64enc( unsigned char* input, size_t in_len );
        
        /// Gets the mime type of the given wxBITMAP_TYPE
-       wxChar* GetMimeType(int imageType);
+    const wxChar* GetMimeType(int imageType);
        
        /// Gets the html equivalent of the specified value
        wxString GetAlignment( const wxTextAttrEx& thisStyle );