wxHtmlWindow::OnLinkClicked and wxHtmlCell::Get/SetLink and wxHtmlWinParser::GetSetLink now work with wxHtmlLinkInfo instead of wxString (making it ready for frames)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/latex/wx/classes.tex

@@ -103,6 +103,7 @@
 \input hthelpct.tex
 \input hthlpdat.tex
 \input hthlpfrm.tex
+\input htlnkinf.tex
 \input htparser.tex
 \input htprint.tex
 \input httag.tex

docs/latex/wx/htcell.tex

@@ -129,9 +129,10 @@ Returns height of the cell (m_Height member).
 
 \membersection{wxHtmlCell::GetLink}\label{wxhtmlcellgetlink}
 
-\constfunc{virtual wxString}{GetLink}{\param{int }{x = 0}, \param{int }{y = 0}}
+\constfunc{virtual wxHtmlLinkInfo*}{GetLink}{\param{int }{x = 0}, \param{int }{y = 0}}
 
-Returns hypertext link if associated with this cell or empty string otherwise.
+Returns hypertext link if associated with this cell or NULL otherwise.
+See \helpref{wxHtmlLinkInfo}{wxhtmllinkinfo}.
 (Note: this makes sense only for visible tags).
 
 \wxheading{Parameters}
@@ -216,10 +217,10 @@ button is pressed, FALSE otherwise}
 
 \membersection{wxHtmlCell::SetLink}\label{wxhtmlcellsetlink}
 
-\func{void}{SetLink}{\param{const wxString\& }{link}}
+\func{void}{SetLink}{\param{const wxHtmlLinkInfo\& }{link}}
 
 Sets the hypertext link asocciated with this cell. (Default value
-is wxEmptyString (no link))
+is \helpref{wxHtmlLinkInfo}{wxhtmllinkinfo}("", "") (no link))
 
 \membersection{wxHtmlCell::SetNext}\label{wxhtmlcellsetnext}
 

docs/latex/wx/htlnkinf.tex

@@ -0,0 +1,48 @@
+%
+% automatically generated by HelpGen from
+% x.h at 23/Dec/99 21:30:20
+%
+
+
+\section{\class{wxHtmlLinkInfo}}\label{wxhtmllinkinfo}
+
+This class stores all neccessary information about hypertext
+links (as represented by {\tt <A>} tag in HTML documents). In 
+current implementation it stores URL and target frame name.
+{\it Note that frames are not currently supported by wxHTML!}
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+
+\membersection{wxHtmlLinkInfo::wxHtmlLinkInfo}\label{wxhtmllinkinfowxhtmllinkinfo}
+
+\func{}{wxHtmlLinkInfo}{\void}
+
+Default ctor.
+
+\membersection{wxHtmlLinkInfo::wxHtmlLinkInfo}\label{wxhtmllinkinfowxhtmllinkinfo}
+
+\func{}{wxHtmlLinkInfo}{\param{const wxString\& }{href}, \param{const wxString\& }{target = wxEmptyString}}
+
+Construct hypertext link from HREF (aka URL) and TARGET (name of target
+frame).
+
+
+\membersection{wxHtmlLinkInfo::GetHref}\label{wxhtmllinkinfogethref}
+
+\func{wxString}{GetHref}{\void}
+
+Returns {\it HREF} value of the {\tt <A>} tag.
+
+\membersection{wxHtmlLinkInfo::GetTarget}\label{wxhtmllinkinfogettarget}
+
+\func{wxString}{GetTarget}{\void}
+
+Returns {\it TARGET} value of the {\tt <A>} tag (this value
+is used to specify in which frame should be the page pointed
+by {\helpref{Href}{wxhtmllinkinfogethref} opened).

docs/latex/wx/htwindow.tex

@@ -121,11 +121,13 @@ FALSE if an error occured, TRUE otherwise
 
 \membersection{wxHtmlWindow::OnLinkClicked}\label{wxhtmlwindowonlinkclicked}
 
-\func{virtual void}{OnLinkClicked}{\param{const wxString\& }{link}}
+\func{virtual void}{OnLinkClicked}{\param{wxHtmlLinkInfo* }{link}}
 
 Called when user clicks on hypertext link. Default behaviour is to call 
 \helpref{LoadPage}{wxhtmlwindowloadpage} and do nothing else.
 
+Also see \helpref{wxHtmlLinkInfo}{wxhtmllinkinfo}.
+
 
 \membersection{wxHtmlWindow::OnSetTitle}\label{wxhtmlwindowonsettitle}
 

docs/latex/wx/htwinprs.tex

@@ -147,9 +147,10 @@ Returns TRUE if actual font is underlined, FALSE otherwise.
 
 \membersection{wxHtmlWinParser::GetLink}\label{wxhtmlwinparsergetlink}
 
-\constfunc{const wxString\&}{GetLink}{\void}
+\constfunc{const wxHtmlLinkInfo\&}{GetLink}{\void}
 
-Returns actual hypertext link. (This value is non-empty string
+Returns actual hypertext link. (This value has non-empty 
+\helpref{Href}{wxhtmllinkinfogethref}} string
 if the parser is between {\tt <A>} and {\tt </A>} tags,
 wxEmptyString otherwise.
 
@@ -229,7 +230,7 @@ Sets italic flag of actualfont. {\it x} is either TRUE of FALSE.
 
 \func{void}{SetFontSize}{\param{int }{s}}
 
-Sets actual font size (HTML size varies from -2 to +4)
+Sets actual font size (HTML size varies from 1 to 7)
 
 \membersection{wxHtmlWinParser::SetFontUnderlined}\label{wxhtmlwinparsersetfontunderlined}
 
@@ -245,9 +246,11 @@ Sets fonts. This method is identical to \helpref{wxHtmlWindow::SetFonts}{wxhtmlw
 
 \membersection{wxHtmlWinParser::SetLink}\label{wxhtmlwinparsersetlink}
 
-\func{void}{SetLink}{\param{const wxString\& }{link}}
+\func{void}{SetLink}{\param{const wxHtmlLinkInfo\& }{link}}
 
-Sets actual hypertext link. wxEmptyString means no link.
+Sets actual hypertext link. Empty link is represented
+by \helpref{wxHtmlLinkInfo}{wxhtmllinkinfo} with {\it Href} equal 
+to wxEmptyString.
 
 \membersection{wxHtmlWinParser::SetLinkColor}\label{wxhtmlwinparsersetlinkcolor}