Minor API changes

[wxWidgets.git] / include / wx / html / htmlpars.h

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index b5c6c6830f722352023ccc780840f2930e8fa595..66f2de8db413d2670b152ad64fbff9c235a341bf 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -18,10 +18,10 @@
 #include "wx/hash.h"
 #include "wx/fontenc.h"
 
 #include "wx/hash.h"
 #include "wx/fontenc.h"
 

-class WXDLLIMPEXP_BASE wxMBConv;
-class WXDLLIMPEXP_HTML wxHtmlParser;
-class WXDLLIMPEXP_HTML wxHtmlTagHandler;
-class WXDLLIMPEXP_HTML wxHtmlEntitiesParser;
+class WXDLLIMPEXP_FWD_BASE wxMBConv;
+class WXDLLIMPEXP_FWD_HTML wxHtmlParser;
+class WXDLLIMPEXP_FWD_HTML wxHtmlTagHandler;
+class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser;

 
 class wxHtmlTextPieces;
 class wxHtmlParserState;
 
 class wxHtmlTextPieces;
 class wxHtmlParserState;


@@ -145,10 +145,9 @@ protected:
 
     // Adds text to the output.
     // This is called from Parse() and must be overriden in derived classes.
 
     // Adds text to the output.
     // This is called from Parse() and must be overriden in derived classes.

-    // txt is not guaranteed to be only one word. It is largest continuous part of text
-    // (= not broken by tags)
-    // NOTE : using char* because of speed improvements
-    virtual void AddText(const wxChar* txt) = 0;
+    // txt is not guaranteed to be only one word. It is largest continuous part
+    // of text (= not broken by tags)
+    virtual void AddText(const wxString& txt) = 0;

 
     // Adds tag and proceeds it. Parse() may (and usually is) called from this method.
     // This is called from Parse() and may be overriden.
 
     // Adds tag and proceeds it. Parse() may (and usually is) called from this method.
     // This is called from Parse() and may be overriden.


@@ -263,16 +262,16 @@ public:
 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)
 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)

-    wxString Parse(const wxString& input);
+    wxString Parse(const wxString& input) const;

 
     // Returns character for given entity or 0 if the enity is unknown
 
     // Returns character for given entity or 0 if the enity is unknown

-    wxChar GetEntityChar(const wxString& entity);
+    wxChar GetEntityChar(const wxString& entity) const;

 
     // Returns character that represents given Unicode code
 #if wxUSE_UNICODE
 
     // Returns character that represents given Unicode code
 #if wxUSE_UNICODE

-    wxChar GetCharForCode(unsigned code) { return (wxChar)code; }
+    wxChar GetCharForCode(unsigned code) const { return (wxChar)code; }

 #else
 #else

-    wxChar GetCharForCode(unsigned code);
+    wxChar GetCharForCode(unsigned code) const;

 #endif
 
 protected:
 #endif
 
 protected: