added template wxScopedArray<> too

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

diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h
index 4a2f2aed3646eb956ae6986c14e9c392e9f500d6..70227dc3a1e616322df1577e925ca5ff80243c0c 100644 (file)
--- a/interface/wx/html/winpars.h
+++ b/interface/wx/html/winpars.h
@@ -78,21 +78,19 @@ protected:
 class wxHtmlWinParser : public wxHtmlParser
 {
 public:
 class wxHtmlWinParser : public wxHtmlParser
 {
 public:

-    wxHtmlWinParser();
-

     /**
         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);
+    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,6 +214,7 @@ 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.

+        @deprecated use GetWindowInterface()->GetHTMLWindow() instead

     */
     wxHtmlWindow* GetWindow();
 
     */
     wxHtmlWindow* GetWindow();