X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..bbee1b4abc13379569607df8f6985ec68dc12231:/src/html/m_links.cpp?ds=sidebyside diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp index e21c9e2f69..588180f01e 100644 --- a/src/html/m_links.cpp +++ b/src/html/m_links.cpp @@ -21,10 +21,8 @@ #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -54,30 +52,32 @@ TAG_HANDLER_BEGIN(A, "A") TAG_HANDLER_PROC(tag) { - if (tag.HasParam("NAME")) { - m_WParser -> GetContainer() -> InsertCell(new wxHtmlAnchorCell(tag.GetParam("NAME"))); + if (tag.HasParam("NAME")) + { + m_WParser->GetContainer()->InsertCell(new wxHtmlAnchorCell(tag.GetParam("NAME"))); } - if (tag.HasParam("HREF")) { - wxHtmlLinkInfo oldlnk = m_WParser -> GetLink(); - wxColour oldclr = m_WParser -> GetActualColor(); - int oldund = m_WParser -> GetFontUnderlined(); + if (tag.HasParam("HREF")) + { + 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(wxHtmlLinkInfo(name, 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(wxHtmlLinkInfo(name, target)); ParseInner(tag); - m_WParser -> SetLink(oldlnk); - m_WParser -> SetFontUnderlined(oldund); - m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont())); - m_WParser -> SetActualColor(oldclr); - m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(oldclr)); + m_WParser->SetLink(oldlnk); + m_WParser->SetFontUnderlined(oldund); + m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->SetActualColor(oldclr); + m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr)); return TRUE; }