X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..29281095c4959cbadfcc66efccf679c6c25c7dc7:/src/html/m_links.cpp?ds=sidebyside diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp index 58876ee6df..4abb172953 100644 --- a/src/html/m_links.cpp +++ b/src/html/m_links.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mod_links.cpp +// Name: m_links.cpp // Purpose: wxHtml module for links & anchors // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,74 +7,91 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif -#include +#include "wx/wxprec.h" -#if wxUSE_HTML +#include "wx/defs.h" +#if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" -FORCE_LINK_ME(mod_links) +FORCE_LINK_ME(m_links) class wxHtmlAnchorCell : public wxHtmlCell { - private: - wxString m_AnchorName; - - public: - wxHtmlAnchorCell(const wxString& name) : wxHtmlCell() {m_AnchorName = name;} - virtual const wxHtmlCell* Find(int condition, const void* param) const +private: + wxString m_AnchorName; + +public: + wxHtmlAnchorCell(const wxString& name) : wxHtmlCell() + { m_AnchorName = name; } + void Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) {} + + virtual const wxHtmlCell* Find(int condition, const void* param) const + { + if ((condition == wxHTML_COND_ISANCHOR) && + (m_AnchorName == (*((const wxString*)param)))) + { + return this; + } + else { - if ((condition == HTML_COND_ISANCHOR) && (m_AnchorName == (*((const wxString*)param)))) - return this; - else - return wxHtmlCell::Find(condition, param); + return wxHtmlCell::Find(condition, param); } + } + + DECLARE_NO_COPY_CLASS(wxHtmlAnchorCell) }; TAG_HANDLER_BEGIN(A, "A") + TAG_HANDLER_CONSTR(A) { } TAG_HANDLER_PROC(tag) { - if (tag.HasParam("NAME")) { - m_WParser -> GetContainer() -> InsertCell(new wxHtmlAnchorCell(tag.GetParam("NAME"))); + if (tag.HasParam( wxT("NAME") )) + { + m_WParser->GetContainer()->InsertCell(new wxHtmlAnchorCell(tag.GetParam( wxT("NAME") ))); } - if (tag.HasParam("HREF")) { - wxString oldlnk = m_WParser -> GetLink(); - wxColour oldclr = m_WParser -> GetActualColor(); - int oldund = m_WParser -> GetFontUnderlined(); - - 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")); + if (tag.HasParam( wxT("HREF") )) + { + wxHtmlLinkInfo oldlnk = m_WParser->GetLink(); + wxColour oldclr = m_WParser->GetActualColor(); + int oldund = m_WParser->GetFontUnderlined(); + wxString name(tag.GetParam( wxT("HREF") )), target; + + if (tag.HasParam( wxT("TARGET") )) target = tag.GetParam( wxT("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; }