Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/html/htmlpars.h b/interface/wx/html/htmlpars.h
index 85c4c67e206d7ada71c6f4a727134376fc940b80..28e7bc690f4f740f6a302b738e9012553873d914 100644 (file)
--- a/interface/wx/html/htmlpars.h
+++ b/interface/wx/html/htmlpars.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxHtmlTagHandler
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxHtmlTagHandler
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -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'


@@ -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.


@@ -299,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);

 };
 
 };