Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11145/src/modules
Modified Files:
HtmlViewer.cpp
Log Message:
use OnLinkClicked(), not OnMouseClick() which changed in wx 2.7
Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -b -u -2 -r1.75 -r1.76
--- HtmlViewer.cpp 16 Jan 2006 20:32:28 -0000 1.75
+++ HtmlViewer.cpp 16 Apr 2006 19:39:45 -0000 1.76
@@ -390,6 +390,4 @@
virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y);
- virtual void OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y,
- const wxMouseEvent& event);
virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
@@ -500,8 +498,4 @@
}
-void HtmlViewerWindow::OnLinkClicked(const wxHtmlLinkInfo& /* link */)
-{
-}
-
void HtmlViewerWindow::OnCellMouseHover(wxHtmlCell *cell,
wxCoord /* x */, wxCoord /* y */)
@@ -527,11 +521,7 @@
}
-void HtmlViewerWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y,
- const wxMouseEvent& event)
+void HtmlViewerWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
- wxHtmlLinkInfo *link = cell->GetLink(x, y);
- if ( link )
- {
- String url = link->GetHref();
+ String url = link.GetHref();
ClickableInfo *ci = GetClickable(url);
@@ -544,4 +534,5 @@
// left click becomes double click as we want to open the URLs on simple
// click
+ const wxMouseEvent& event = *link.GetEvent();
m_viewer->GetMessageView()->DoMouseCommand
(
@@ -552,8 +543,4 @@
event.GetPosition()
);
- }
-
- // don't call the base class version, we don't want it to automatically
- // load any URLs which may be in the text!
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
