From 9bc8fded1b3e6e20da20c2471aead3d5761a6bcd Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 12 Jan 2000 08:27:07 +0000 Subject: [PATCH] added wxHtmlLinkInfo::GetHtmlCell so that you know where it came from git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/htlnkinf.tex | 21 +++++++++++++++++++-- include/wx/html/htmlcell.h | 11 +++++++---- src/html/htmlcell.cpp | 1 + 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/docs/latex/wx/htlnkinf.tex b/docs/latex/wx/htlnkinf.tex index 5c5d8e08c4..88ab0b1c83 100644 --- a/docs/latex/wx/htlnkinf.tex +++ b/docs/latex/wx/htlnkinf.tex @@ -22,17 +22,34 @@ Default ctor. Construct hypertext link from HREF (aka URL) and TARGET (name of target frame). +\membersection{wxHtmlLinkInfo::GetEvent}\label{wxhtmllinkinfogetevent} + +\func{const wxMouseEvent *}{GetEvent}{\void} + +Return pointer to event that generated OnLinkClicked event. Valid +only within \helpref{wxHtmlWindow::OnLinkClicked}{wxhtmlwindowonlinkclicked}, +NULL otherwise. + +\membersection{wxHtmlLinkInfo::GetHtmlCell}\label{wxhtmllinkinfogethtmlcell} + +\func{const wxHtmlCell *}{GetHtmlCell}{\void} + +Return pointer to the cell that was clicked. Valid +only within \helpref{wxHtmlWindow::OnLinkClicked}{wxhtmlwindowonlinkclicked}, +NULL otherwise. + + \membersection{wxHtmlLinkInfo::GetHref}\label{wxhtmllinkinfogethref} \func{wxString}{GetHref}{\void} -Returns {\it HREF} value of the {\tt } tag. +Return {\it HREF} value of the {\tt } tag. \membersection{wxHtmlLinkInfo::GetTarget}\label{wxhtmllinkinfogettarget} \func{wxString}{GetTarget}{\void} -Returns {\it TARGET} value of the {\tt } tag (this value +Return {\it TARGET} value of the {\tt } tag (this value is used to specify in which frame should be the page pointed by {\helpref{Href}{wxhtmllinkinfogethref} opened). diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index 0b9e167830..7af5cec39f 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -312,23 +312,26 @@ class WXDLLEXPORT wxHtmlLinkInfo : public wxObject { public: wxHtmlLinkInfo() : wxObject() - { m_Href = m_Target = wxEmptyString; m_Event = NULL; } + { m_Href = m_Target = wxEmptyString; m_Event = NULL, m_Cell = NULL; } wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject() - { m_Href = href; m_Target = target; m_Event = NULL; } + { m_Href = href; m_Target = target; m_Event = NULL, m_Cell = NULL; } wxHtmlLinkInfo(const wxHtmlLinkInfo& l) - { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event; } + { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; } wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l) - { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event; return *this; } + { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event, m_Cell = l.m_Cell; return *this; } void SetEvent(const wxMouseEvent *e) { m_Event = e; } + void SetHtmlCell(const wxHtmlCell *e) { m_Cell = e; } wxString GetHref() const { return m_Href; } wxString GetTarget() const { return m_Target; } const wxMouseEvent* GetEvent() const { return m_Event; } + const wxHtmlCell* GetHtmlCell() const { return m_Cell; } private: wxString m_Href, m_Target; const wxMouseEvent *m_Event; + const wxHtmlCell *m_Cell; }; diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index af01bcbfe6..542c1c656e 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -57,6 +57,7 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, { wxHtmlLinkInfo lnk2(*lnk); lnk2.SetEvent(&event); + lnk2.SetHtmlCell(this); ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk2); // note : this overcasting is legal because parent is *always* wxHtmlWindow } -- 2.45.2