Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h
index 97a39b1e49f7031407d659f35aabe9c24565c950..6e7d0158fa9e67709028091b37f1ea16448dac03 100644 (file)
--- a/interface/wx/html/winpars.h
+++ b/interface/wx/html/winpars.h
@@ -2,8 +2,7 @@
 // Name:        html/winpars.h
 // Purpose:     interface of wxHtmlTagsModule
 // Author:      wxWidgets team
 // Name:        html/winpars.h
 // Purpose:     interface of wxHtmlTagsModule
 // Author:      wxWidgets team

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

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


@@ -50,6 +49,18 @@ public:
 */
 class wxHtmlWinTagHandler : public wxHtmlTagHandler
 {
 */
 class wxHtmlWinTagHandler : public wxHtmlTagHandler
 {

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

 protected:
     /**
         Value of this attribute is identical to value of m_Parser.
 protected:
     /**
         Value of this attribute is identical to value of m_Parser.


@@ -78,21 +89,19 @@ protected:
 class wxHtmlWinParser : public wxHtmlParser
 {
 public:
 class wxHtmlWinParser : public wxHtmlParser
 {
 public:

-    wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
-

     /**
         Constructor.
 
     /**
         Constructor.
 

-        Don't use the default one, use constructor with @a wndIface parameter
+        Don't use the default one, use the constructor with @a wndIface parameter

         (@a wndIface is a pointer to interface object for the associated wxHtmlWindow
         or other HTML rendering window such as wxHtmlListBox).
     */
         (@a wndIface is a pointer to interface object for the associated wxHtmlWindow
         or other HTML rendering window such as wxHtmlListBox).
     */

-    wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
+    wxHtmlWinParser(wxHtmlWindowInterface* wndIface = NULL);

 
     /**
         Adds module() to the list of wxHtmlWinParser tag handler.
     */
 
     /**
         Adds module() to the list of wxHtmlWinParser tag handler.
     */

-    static void AddModule(wxHtmlTagsModule module);
+    static void AddModule(wxHtmlTagsModule* module);

 
     /**
         Closes the container, sets actual container to the parent one
 
     /**
         Closes the container, sets actual container to the parent one


@@ -216,8 +225,8 @@ public:
         (You should always test if it is non-@NULL.
         For example @c TITLE handler sets window title only if some window is
         associated, otherwise it does nothing.
         (You should always test if it is non-@NULL.
         For example @c TITLE handler sets window title only if some window is
         associated, otherwise it does nothing.

-    */
-    wxHtmlWindow* GetWindow();
+   */
+    wxHtmlWindowInterface* GetWindowInterface();

 
     /**
         Opens new container and returns pointer to it (see @ref overview_html_cells).
 
     /**
         Opens new container and returns pointer to it (see @ref overview_html_cells).