added wxUINTn_MAX constants; document them together with the existing wxINTn_MIN...

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

diff --git a/interface/wx/html/htmlwin.h b/interface/wx/html/htmlwin.h
index 2aa8bb3c9ef6692d399bb3c24fe12d6efa72d63a..dd08acaa0e1f791f84be04f468efd05a2e865d44 100644 (file)
--- a/interface/wx/html/htmlwin.h
+++ b/interface/wx/html/htmlwin.h
@@ -35,7 +35,7 @@
     @endStyleTable
 
 
     @endStyleTable
 
 

-    @beginEventTable{wxHtmlCellEvent, wxHtmlLinkEvent}
+    @beginEventEmissionTable{wxHtmlCellEvent, wxHtmlLinkEvent}

     @event{EVT_HTML_CELL_CLICKED(id, func)}
         A wxHtmlCell was clicked.
     @event{EVT_HTML_CELL_HOVER(id, func)}
     @event{EVT_HTML_CELL_CLICKED(id, func)}
         A wxHtmlCell was clicked.
     @event{EVT_HTML_CELL_HOVER(id, func)}


@@ -61,12 +61,11 @@ public:
         Constructor.
         The parameters are the same as wxScrolled::wxScrolled() constructor.
     */
         Constructor.
         The parameters are the same as wxScrolled::wxScrolled() constructor.
     */

-    wxHtmlWindow(wxWindow parent, wxWindowID id = -1,
+    wxHtmlWindow(wxWindow *parent, wxWindowID id = wxID_ANY,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHW_DEFAULT_STYLE,
                  const wxString& name = "htmlWindow");
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHW_DEFAULT_STYLE,
                  const wxString& name = "htmlWindow");

-    //@}

 
     /**
         Adds @ref overview_html_filters "input filter" to the static list of available
 
     /**
         Adds @ref overview_html_filters "input filter" to the static list of available


@@ -75,7 +74,7 @@ public:
         - @c image/* MIME types
         - Plain Text filter (this filter is used if no other filter matches)
     */
         - @c image/* MIME types
         - Plain Text filter (this filter is used if no other filter matches)
     */

-    static void AddFilter(wxHtmlFilter filter);
+    static void AddFilter(wxHtmlFilter* filter);

 
     /**
         Appends HTML fragment to currently displayed text and refreshes the window.
 
     /**
         Appends HTML fragment to currently displayed text and refreshes the window.


@@ -267,7 +266,7 @@ public:
     /**
         This function sets the space between border of window and HTML contents.
         See image:
     /**
         This function sets the space between border of window and HTML contents.
         See image:

-        @image html border.png
+        @image html htmlwin_border.png

 
         @param b
             indentation from borders in pixels
 
         @param b
             indentation from borders in pixels


@@ -429,7 +428,7 @@ public:
     /**
         The constructor is not normally used by the user code.
     */
     /**
         The constructor is not normally used by the user code.
     */

-    wxHyperlinkEvent(int id, const wxHtmlLinkInfo& linkinfo);
+    wxHtmlLinkEvent(int id, const wxHtmlLinkInfo& linkinfo);

 
     /**
         Returns the wxHtmlLinkInfo which contains info about the cell clicked
 
     /**
         Returns the wxHtmlLinkInfo which contains info about the cell clicked


@@ -464,7 +463,8 @@ public:
     */
     wxHtmlCellEvent(wxEventType commandType, int id,
                     wxHtmlCell* cell,
     */
     wxHtmlCellEvent(wxEventType commandType, int id,
                     wxHtmlCell* cell,

-                    const wxPoint& point);
+                    const wxPoint& point,
+                    const wxMouseEvent& ev);

 
     /**
         Returns the wxHtmlCellEvent associated with the event.
 
     /**
         Returns the wxHtmlCellEvent associated with the event.