Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/html/htmlpars.h b/interface/wx/html/htmlpars.h
index 20ff8e07d498015ac788b28e3fa96678d4912f7c..d5359ec8c17fdc0a8051f1d3eac6b076c11ac479 100644 (file)
--- a/interface/wx/html/htmlpars.h
+++ b/interface/wx/html/htmlpars.h
@@ -2,10 +2,18 @@
 // Name:        html/htmlpars.h
 // Purpose:     interface of wxHtmlTagHandler
 // Author:      wxWidgets team
 // Name:        html/htmlpars.h
 // Purpose:     interface of wxHtmlTagHandler
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+enum wxHtmlURLType
+{
+    wxHTML_URL_PAGE,
+    wxHTML_URL_IMAGE,
+    wxHTML_URL_OTHER
+};
+
+
+

 /**
     @class wxHtmlTagHandler
 
 /**
     @class wxHtmlTagHandler
 


@@ -57,10 +65,18 @@ public:
 
     /**
         Assigns @a parser to this handler. Each @b instance of handler
 
     /**
         Assigns @a parser to this handler. Each @b instance of handler

-        is guaranteed to be called only from the parser.
+        is guaranteed to be called only from the one parser.

     */
     virtual void SetParser(wxHtmlParser* parser);
 
     */
     virtual void SetParser(wxHtmlParser* parser);
 

+    /**
+       Returns the parser associated with this tag handler.
+
+       @since 2.9.5
+    */
+    wxHtmlParser* GetParser() const;
+
+

 protected:
 
     /**
 protected:
 
     /**


@@ -75,6 +91,14 @@ protected:
     */
     void ParseInner(const wxHtmlTag& tag);
 
     */
     void ParseInner(const wxHtmlTag& tag);
 

+    /**
+       Parses given source as if it was tag's inner code (see
+       wxHtmlParser::GetInnerSource).  Unlike ParseInner(), this method lets
+       you specify the source code to parse. This is useful when you need to
+       modify the inner text before parsing.
+    */
+    void ParseInnerSource(const wxString& source);
+

     /**
         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.


@@ -139,7 +163,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.