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

diff --git a/docs/latex/wx/htlnkinf.tex b/docs/latex/wx/htlnkinf.tex
index 5c5d8e08c4e3f604c3f07adf95c453efe1559ec2..88ab0b1c835208ab69480cd8c71e6c7c325b0644 100644 (file)
--- 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).
 
 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}
 
 \membersection{wxHtmlLinkInfo::GetHref}\label{wxhtmllinkinfogethref}
 
 \func{wxString}{GetHref}{\void}
 

-Returns {\it HREF} value of the {\tt <A>} tag.
+Return {\it HREF} value of the {\tt <A>} tag.

 
 \membersection{wxHtmlLinkInfo::GetTarget}\label{wxhtmllinkinfogettarget}
 
 \func{wxString}{GetTarget}{\void}
 
 
 \membersection{wxHtmlLinkInfo::GetTarget}\label{wxhtmllinkinfogettarget}
 
 \func{wxString}{GetTarget}{\void}
 

-Returns {\it TARGET} value of the {\tt <A>} tag (this value
+Return {\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).
 
 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 0b9e1678305b4174c250685792956fb663be92d3..7af5cec39fa274ec07a43c6e0f97a696b5f281d6 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -312,23 +312,26 @@ class WXDLLEXPORT wxHtmlLinkInfo : public wxObject
 {
     public:
         wxHtmlLinkInfo() : 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()
         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)
         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)
         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 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; }
 
         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;
 
     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 af01bcbfe67a7c146fc3846c4153c40ce4440b8f..542c1c656e3af11270bd422445182082964416fb 100644 (file)
--- 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);
     {
         wxHtmlLinkInfo lnk2(*lnk);
         lnk2.SetEvent(&event);

+        lnk2.SetHtmlCell(this);

         ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk2);
         // note : this overcasting is legal because parent is *always* wxHtmlWindow
     }
         ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk2);
         // note : this overcasting is legal because parent is *always* wxHtmlWindow
     }