Make wxPGValidationInfo class instead of struct, re-document it (used at least by...

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

diff --git a/interface/wx/html/htmlwin.h b/interface/wx/html/htmlwin.h
index 3b6ccc2912010cc8733cced982ee0de09414c1ed..5af32056fee5960429a8b0f429d1e923393d6b6a 100644 (file)
--- a/interface/wx/html/htmlwin.h
+++ b/interface/wx/html/htmlwin.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxHtmlWindow
-    @headerfile htmlwin.h wx/html/htmlwin.h
 
     wxHtmlWindow is probably the only class you will directly use
     unless you want to do something special (like adding new tag
@@ -89,20 +88,20 @@ public:
         If no page is opened or if the displayed page wasn't
         produced by call to LoadPage, empty string is returned.
     */
-    wxString GetOpenedAnchor();
+    wxString GetOpenedAnchor() const;
 
     /**
         Returns full location of the opened page. If no page is opened or if the
         displayed page wasn't
         produced by call to LoadPage, empty string is returned.
     */
-    wxString GetOpenedPage();
+    wxString GetOpenedPage() const;
 
     /**
         Returns title of the opened page or wxEmptyString if current page does not
         contain @c TITLE tag.
     */
-    wxString GetOpenedPageTitle();
+    wxString GetOpenedPageTitle() const;
 
     /**
         Returns the related frame.
@@ -144,7 +143,7 @@ public:
         
         @see LoadPage()
     */
-    virtual bool LoadFile(const wxFileName& filename);
+    bool LoadFile(const wxFileName& filename);
 
     /**
         Unlike SetPage this function first loads HTML page from @a location
@@ -257,8 +256,8 @@ public:
             URL if OnOpeningURL returns wxHTML_REDIRECT.
     */
     virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
-            const wxString& url,
-            wxString* redirect);
+                                             const wxString& url,
+                                             wxString* redirect) const;
 
     /**
         Called on parsing @c TITLE tag.
@@ -353,7 +352,7 @@ public:
         
         @return @false if an error occurred, @true otherwise.
     */
-    bool SetPage(const wxString& source);
+    virtual bool SetPage(const wxString& source);
 
     /**
         Sets the frame in which page title will be displayed. @a format is format of
@@ -411,7 +410,6 @@ public:
 
 /**
     @class wxHtmlLinkEvent
-    @headerfile htmlwin.h wx/html/htmlwin.h
 
     This event class is used for the events generated by wxHtmlWindow.
 
@@ -437,7 +435,6 @@ public:
 
 /**
     @class wxHtmlCellEvent
-    @headerfile htmlwin.h wx/html/htmlwin.h
 
     This event class is used for the events generated by wxHtmlWindow.