few other fixes for wxChar => wxString

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

diff --git a/interface/wx/html/htmlpars.h b/interface/wx/html/htmlpars.h
index dc97e2f6bf4584aa2651d7c1f40a33f455213e36..82dfb28c4933c51dfb698201ded474b8d7fedc61 100644 (file)
--- a/interface/wx/html/htmlpars.h
+++ b/interface/wx/html/htmlpars.h
@@ -55,6 +55,14 @@ public:
     */
     virtual bool HandleTag(const wxHtmlTag& tag) = 0;
 
     */
     virtual bool HandleTag(const wxHtmlTag& tag) = 0;
 

+    /**
+        Assigns @a parser to this handler. Each @b instance of handler
+        is guaranteed to be called only from the parser.
+    */
+    virtual void SetParser(wxHtmlParser* parser);
+
+protected:
+

     /**
         This method calls parser's wxHtmlParser::DoParsing method
         for the string between this tag and the paired ending tag:
     /**
         This method calls parser's wxHtmlParser::DoParsing method
         for the string between this tag and the paired ending tag:


@@ -67,13 +75,6 @@ public:
     */
     void ParseInner(const wxHtmlTag& tag);
 
     */
     void ParseInner(const wxHtmlTag& tag);
 

-    /**
-        Assigns @a parser to this handler. Each @b instance of handler
-        is guaranteed to be called only from the parser.
-    */
-    virtual void SetParser(wxHtmlParser parser);
-
-protected:

     /**
         This attribute is used to access parent parser. It is protected so that
         it can't be accessed by user but can be accessed from derived classes.
     /**
         This attribute is used to access parent parser. It is protected so that
         it can't be accessed by user but can be accessed from derived classes.


@@ -113,17 +114,6 @@ public:
     */
     wxHtmlParser();
 
     */
     wxHtmlParser();
 

-    /**
-        This may (and may not) be overwritten in derived class.
-
-        This method is called each time new tag is about to be added.
-        @a tag contains information about the tag. (See wxHtmlTag for details.)
-
-        Default (wxHtmlParser) behaviour is this: first it finds a handler capable
-        of handling this tag and then it calls handler's HandleTag() method.
-    */
-    virtual void AddTag(const wxHtmlTag& tag);
-

     /**
         Adds handler to the internal list ( hash table) of handlers.
         This method should not be called directly by user but rather by derived class'
     /**
         Adds handler to the internal list ( hash table) of handlers.
         This method should not be called directly by user but rather by derived class'


@@ -135,7 +125,7 @@ public:
 
         All handlers are deleted on object deletion.
     */
 
         All handlers are deleted on object deletion.
     */

-    virtual void AddTagHandler(wxHtmlTagHandler handler);
+    virtual void AddTagHandler(wxHtmlTagHandler* handler);

 
     /**
         Must be overwritten in derived class.
 
     /**
         Must be overwritten in derived class.


@@ -149,7 +139,7 @@ public:
     /**
         Parses the m_Source from @a begin_pos to @a end_pos - 1.
     */
     /**
         Parses the m_Source from @a begin_pos to @a end_pos - 1.
     */

-    void DoParsing(int begin_pos, int end_pos);
+    void DoParsing(const const_iterator& begin_pos, const const_iterator& end_pos);

 
     /**
         Parses the whole m_Source.
 
     /**
         Parses the whole m_Source.


@@ -184,7 +174,7 @@ public:
     /**
         Returns pointer to the source being parsed.
     */
     /**
         Returns pointer to the source being parsed.
     */

-    wxString* GetSource();
+    const wxString* GetSource();

 
     /**
         Setups the parser for parsing the @a source string.
 
     /**
         Setups the parser for parsing the @a source string.


@@ -217,8 +207,7 @@ public:
         Returned wxFSFile object is not guaranteed to point to url, it might have
         been redirected!
     */
         Returned wxFSFile object is not guaranteed to point to url, it might have
         been redirected!
     */

-    virtual wxFSFile* OpenURL(wxHtmlURLType type,
-                              const wxString& url);
+    virtual wxFSFile* OpenURL(wxHtmlURLType type, const wxString& url) const;

 
     /**
         Proceeds parsing of the document. This is end-user method. You can simply
 
     /**
         Proceeds parsing of the document. This is end-user method. You can simply


@@ -292,7 +281,7 @@ public:
         Sets the virtual file system that will be used to request additional files.
         (For example @c IMG tag handler requests wxFSFile with the image data.)
     */
         Sets the virtual file system that will be used to request additional files.
         (For example @c IMG tag handler requests wxFSFile with the image data.)
     */

-    void SetFS(wxFileSystem fs);
+    void SetFS(wxFileSystem* fs);

 
     /**
         Call this function to interrupt parsing from a tag handler.
 
     /**
         Call this function to interrupt parsing from a tag handler.


@@ -300,5 +289,18 @@ public:
         from Parse() or any function called by it (i.e. from tag handlers).
     */
     virtual void StopParsing();
         from Parse() or any function called by it (i.e. from tag handlers).
     */
     virtual void StopParsing();

+
+protected:
+
+    /**
+        This may (and may not) be overwritten in derived class.
+
+        This method is called each time new tag is about to be added.
+        @a tag contains information about the tag. (See wxHtmlTag for details.)
+
+        Default (wxHtmlParser) behaviour is this: first it finds a handler capable
+        of handling this tag and then it calls handler's HandleTag() method.
+    */
+    virtual void AddTag(const wxHtmlTag& tag);

 };
 
 };