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
This commit is contained in:
Václav Slavík
1999-12-23 21:12:23 +00:00
parent f2c2fa4d62
commit 846914d18d
12 changed files with 156 additions and 47 deletions

View File

@@ -59,15 +59,17 @@ TAG_HANDLER_BEGIN(A, "A")
}
if (tag.HasParam("HREF")) {
wxString oldlnk = m_WParser -> GetLink();
wxHtmlLinkInfo oldlnk = m_WParser -> GetLink();
wxColour oldclr = m_WParser -> GetActualColor();
int oldund = m_WParser -> GetFontUnderlined();
wxString name(tag.GetParam("HREF")), target;
if (tag.HasParam("TARGET")) target = tag.GetParam("TARGET");
m_WParser -> SetActualColor(m_WParser -> GetLinkColor());
m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(m_WParser -> GetLinkColor()));
m_WParser -> SetFontUnderlined(TRUE);
m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
m_WParser -> SetLink(tag.GetParam("HREF"));
m_WParser -> SetLink(wxHtmlLinkInfo(name, target));
ParseInner(tag);